Merge branch 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm into d-nougat-released-nougat-release

* 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm:
  TEMP: disable bluetooth hardware feature
  Revert "jacinto6evm: changes for defining auto platform"
  jacinto6evm: add vsync offsets
  jacinto6evm: remove extra hardware feature
  jacinto6evm: media_codecs.xml: fix alignment value
  jacinto6evm: Set product files and packages for APPE based audio
  jacinto6evm: Add the 'radio_app' service
  jacinto6evm: Start lad_dra7xx with GateMP
  jacinto6evm: Set permissions for IPC daemon and device files
  jacinto6evm: Set 'media' user for i2c devices
  jacinto6evm: update ramdisk offset
  jacinto6evm: sepolicy: add rules for cpuset script
  jacinto6evm: sepolicy: update pvr module_load permission

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

11 files changed, 61 insertions, 29 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index c475c49..4170a7d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,7 +40,7 @@ TARGET_NO_BOOTLOADER := true
 
 BOARD_KERNEL_BASE := 0x80000000
 #BOARD_KERNEL_CMDLINE := console=ttyO2,115200n8 mem=1024M androidboot.console=ttyO2 androidboot.hardware=jacinto6evmboard vram=20M omapfb.vram=0:16M
-BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01f00000
+BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x03000000
 
 TARGET_NO_RADIOIMAGE := true
 TARGET_BOARD_PLATFORM := jacinto6
@@ -79,3 +79,7 @@ BOARD_SEPOLICY_DIRS := device/ti/jacinto6evm/sepolicy
 
 # lidbrm driver
 BOARD_GPU_DRIVERS := omapdrm
+
+# DispSync vsync offsets in nanoseconds
+VSYNC_EVENT_PHASE_OFFSET_NS := 7500000
+SF_VSYNC_EVENT_PHASE_OFFSET_NS := 5000000
diff --git a/audio/Android.mk b/audio/Android.mk
index 9e14b16..d73e0c1 100644
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -13,4 +13,9 @@
 # limitations under the License.
 
 LOCAL_PATH := $(call my-dir)
+
+ifeq ($(APPE_AUDIO),true)
+include $(LOCAL_PATH)/hdmi/Android.mk
+else
 include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
diff --git a/device.mk b/device.mk
index 70d2c42..fb812e4 100644
--- a/device.mk
+++ b/device.mk
@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Audio Post Processing Engine (APPE)
+APPE_AUDIO := false
+
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 LOCAL_KERNEL := device/ti/jacinto6evm/kernel
 else
@@ -42,13 +45,19 @@ PRODUCT_COPY_FILES := \
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
-        frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \
-        frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
+        frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml
 
 # Audio
+ifeq ($(APPE_AUDIO),true)
+PRODUCT_COPY_FILES += \
+        hardware/ti/radio/vis_sdk/packages/android/hal/mixer_paths.xml:system/etc/mixer_paths.xml
+else
 PRODUCT_COPY_FILES += \
         device/ti/jacinto6evm/audio/primary/mixer_paths.xml:system/etc/mixer_paths.xml \
-        device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml \
+        device/ti/jacinto6evm/audio/jamr3/jamr3_mixer_paths.xml:system/etc/jamr3_mixer_paths.xml
+endif
+
+PRODUCT_COPY_FILES += \
         device/ti/jacinto6evm/audio/audio_policy.conf:system/etc/audio_policy.conf
 
 # cpuset configuration
@@ -103,12 +112,15 @@ PRODUCT_PACKAGES += \
 
 # Audio HAL modules
 PRODUCT_PACKAGES += audio.primary.jacinto6
-PRODUCT_PACKAGES += audio.jamr3.jacinto6
 PRODUCT_PACKAGES += audio.hdmi.jacinto6
 # BlueDroid a2dp Audio HAL module
 PRODUCT_PACKAGES += audio.a2dp.default
 # Remote submix
 PRODUCT_PACKAGES += audio.r_submix.default
+# JAMR3 Audio HAL module
+ifneq ($(APPE_AUDIO),true)
+PRODUCT_PACKAGES += audio.jamr3.jacinto6
+endif
 
 PRODUCT_PACKAGES += \
         tinymix \
diff --git a/init.jacinto6evmboard.rc b/init.jacinto6evmboard.rc
index 318d6f4..00efc75 100644
--- a/init.jacinto6evmboard.rc
+++ b/init.jacinto6evmboard.rc
@@ -15,8 +15,8 @@ on post-fs-data
     setprop vold.post_fs_data_done 1
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     chown dhcp dhcp /data/misc/dhcp
-    mkdir /data/lad 0770 system system
-    mkdir /data/lad/LAD 0770 system system
+    mkdir /data/lad 0770 media system
+    mkdir /data/lad/LAD 0770 media system
 
 # enabling thermal zone for mpu
     write /sys/class/thermal/thermal_zone0/mode enabled
@@ -136,10 +136,16 @@ service hostapd_bin /system/bin/hostapd -d /data/misc/wifi/hostapd.conf
     disabled
     oneshot
 
-service lad_dra7xx /system/bin/logwrapper /system/bin/lad_dra7xx
+service lad_dra7xx /system/bin/logwrapper /system/bin/lad_dra7xx -g
     class main
-    user system
+    user media
     group system
+    oneshot
+
+service radio_app /system/bin/logwrapper /system/bin/RadioApp -h eth
+    class main
+    user media
+    group system inet
     disabled
     oneshot
 
diff --git a/media_codecs.xml b/media_codecs.xml
index 6c34266..3482216 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -27,7 +27,7 @@
 
             <Type name="video/avc">
                 <Limit name="size" min="64x64" max="1920x1088" />
-                <Limit name="alignment" value="16x16" />
+                <Limit name="alignment" value="2x2" />
                 <Limit name="block-size" value="16x16" />
                 <Limit name="blocks-per-second" min="1" max="489600" />
                 <Limit name="bitrate" range="1-62500000" />
@@ -36,7 +36,7 @@
 
             <Type name="video/mp4v-es">
                 <Limit name="size" min="64x64" max="1920x1088" />
-                <Limit name="alignment" value="16x16" />
+                <Limit name="alignment" value="2x2" />
                 <Limit name="block-size" value="16x16" />
                 <Limit name="blocks-per-second" min="1" max="489600" />
                 <Limit name="bitrate" range="1-62500000" />
@@ -44,7 +44,7 @@
 
             <Type name="video/3gpp">
                 <Limit name="size" min="64x64" max="1920x1088" />
-                <Limit name="alignment" value="16x16" />
+                <Limit name="alignment" value="2x2" />
                 <Limit name="block-size" value="16x16" />
                 <Limit name="blocks-per-second" min="1" max="489600" />
                 <Limit name="bitrate" range="1-62500000" />
@@ -52,7 +52,7 @@
 
             <Type name="video/mpeg2">
                 <Limit name="size" min="64x64" max="1920x1088" />
-                <Limit name="alignment" value="16x16" />
+                <Limit name="alignment" value="2x2" />
                 <Limit name="block-size" value="16x16" />
                 <Limit name="blocks-per-second" min="1" max="489600" />
                 <Limit name="bitrate" range="1-62500000" />
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index efaf79e..009fd1f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -101,13 +101,4 @@
     -->
     <bool name="config_enableWifiDisplay">true</bool>
 
-    <!-- Control the default UI mode type to use when there is no other type override
-         happening.  One of the following values (See Configuration.java):
-             1  UI_MODE_TYPE_NORMAL
-             4  UI_MODE_TYPE_TELEVISION
-             5  UI_MODE_TYPE_APPLIANCE
-             6  UI_MODE_TYPE_WATCH
-         Any other values will have surprising consequences. -->
-    <integer name="config_defaultUiModeType">3</integer>
-
 </resources>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 666c7e1..6ac1f73 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -22,6 +22,9 @@
 #Real Time Clock
 /dev/rtc0                       u:object_r:rtc:s0
 
+#cpuset script
+/system/bin/init.jacinto6evmboard.cpuset.sh     u:object_r:init-cpuset-sh_exec:s0
+
 #Block devices
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system     u:object_r:system_block_device:s0
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery   u:object_r:recovery_block_device:s0
diff --git a/sepolicy/init-cpuset-sh.te b/sepolicy/init-cpuset-sh.te
new file mode 100644
index 0000000..4547c45
--- /dev/null
+++ b/sepolicy/init-cpuset-sh.te
@@ -0,0 +1,7 @@
+type init-cpuset-sh, domain;
+type init-cpuset-sh_exec, exec_type, file_type;
+
+init_daemon_domain(init-cpuset-sh)
+
+allow init-cpuset-sh system_file:file execute_no_trans;
+allow init-cpuset-sh shell_exec:file read;
diff --git a/sepolicy/pvr.te b/sepolicy/pvr.te
index fe4bf37..1e9cfa8 100644
--- a/sepolicy/pvr.te
+++ b/sepolicy/pvr.te
@@ -9,3 +9,4 @@ allow pvr gpu_device:chr_file rw_file_perms;
 
 # allow graphics driver initialization
 allow pvr self:capability sys_module;
+allow pvr system_file:system module_load;
diff --git a/tablet_core_hardware_jacinto6evm.xml b/tablet_core_hardware_jacinto6evm.xml
index eca9205..eaabd64 100644
--- a/tablet_core_hardware_jacinto6evm.xml
+++ b/tablet_core_hardware_jacinto6evm.xml
@@ -27,11 +27,10 @@
     <feature name="android.hardware.faketouch" />
     <feature name="android.hardware.microphone" />
     <feature name="android.hardware.screen.landscape" />
-    <feature name="android.hardware.bluetooth" />
+    <!--<feature name="android.hardware.bluetooth" />-->
     <feature name="android.software.app_widgets" />
     <feature name="android.software.home_screen" />
     <!-- Feature to specify if the device supports adding device admins. -->
     <feature name="android.software.device_admin" />
     <feature name="android.software.backup" />
-    <feature name="android.hardware.type.automotive" />
 </permissions>
diff --git a/ueventd.jacinto6evmboard.rc b/ueventd.jacinto6evmboard.rc
index d30f01c..9ca382c 100644
--- a/ueventd.jacinto6evmboard.rc
+++ b/ueventd.jacinto6evmboard.rc
@@ -18,13 +18,17 @@
 /dev/hci_tty              0666   bluetooth bluetooth
 
 # Radio Tuners
-/dev/i2c-0                0660   system system
-/dev/i2c-1                0660   system system
-/dev/i2c-3                0660   system system
-/dev/i2c-4                0660   system system
+/dev/i2c-0                0660   media system
+/dev/i2c-1                0660   media system
+/dev/i2c-3                0660   media system
+/dev/i2c-4                0660   media system
 
 # cmem
-/dev/cmem                 0660   system system
+/dev/cmem                 0660   media system
+
+# ipc
+/dev/uio0                 0660   media system
+/dev/hwspinlock           0660   media system
 
 # for GNSS
 /dev/tigps                0666   root       root