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

* 'd-nougat-release' of git://git.omapzoom.org/device/ti/jacinto6evm:
  Revert "jacinto6evm: TEMP: disable wlan/wpan firmware makefiles"
  jacinto6evm: update prebuilt kernel to recent
  jacinto6evm: changes for defining auto platform
  jacinto6evm: TEMP: disable wlan/wpan firmware makefiles
  Revert "jacinto6evm: sepolicy: updates for configFS"
  Revert "jacinto6evm: sepolicy: allow init to delete symlinks on /config"
  jacinto6evm: TEMP: remove custom wallpaper
  jacinto6evm: remove COMMON_GLOBAL_CFLAGS
  jacinto6evm: sepolicy: allow init to delete symlinks on /config

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

8 files changed, 13 insertions, 11 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2cbfdb9..c475c49 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,7 +21,7 @@ BOARD_USES_GENERIC_AUDIO := true
 OMAP_ENHANCEMENT := true
 
 ifeq ($(OMAP_ENHANCEMENT),true)
-COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT
+#COMMON_GLOBAL_CFLAGS += -DOMAP_ENHANCEMENT
 endif
 
 TARGET_CPU_ABI := armeabi-v7a
@@ -71,8 +71,8 @@ BOARD_WPA_SUPPLICANT_PRIVATE_LIB  := lib_driver_cmd_wl12xx
 BOARD_HOSTAPD_PRIVATE_LIB         := lib_driver_cmd_wl12xx
 BOARD_WLAN_DEVICE           := wl12xx_mac80211
 BOARD_SOFTAP_DEVICE         := wl12xx_mac80211
-COMMON_GLOBAL_CFLAGS += -DUSES_TI_MAC80211
-COMMON_GLOBAL_CFLAGS += -DANDROID_LIB_STUB
+#COMMON_GLOBAL_CFLAGS += -DUSES_TI_MAC80211
+#COMMON_GLOBAL_CFLAGS += -DANDROID_LIB_STUB
 endif
 
 BOARD_SEPOLICY_DIRS := device/ti/jacinto6evm/sepolicy
diff --git a/kernel b/kernel
index 7580699..cae6744 100644
--- a/kernel
+++ b/kernel
diff --git a/overlay/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg b/overlay/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
deleted file mode 100644
index 41e4363..0000000
--- a/overlay/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
+++ /dev/null
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 009fd1f..efaf79e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -101,4 +101,13 @@
     -->
     <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.te b/sepolicy/file.te
deleted file mode 100644
index 2d8644d..0000000
--- a/sepolicy/file.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# /config
-type configfs, fs_type;
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
deleted file mode 100644
index 50c7cd7..0000000
--- a/sepolicy/genfs_contexts
+++ /dev/null
@@ -1 +0,0 @@
-genfscon configfs / u:object_r:configfs:s0
diff --git a/sepolicy/init.te b/sepolicy/init.te
index b0822c6..1c88dbc 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -2,8 +2,3 @@
 allow init self:capability sys_module;
 #Create symlinks for storage
 allow init tmpfs:lnk_file create_file_perms;
-
-# /config
-allow init configfs:dir create_dir_perms;
-allow init configfs:file w_file_perms;
-allow init configfs:lnk_file create;
diff --git a/tablet_core_hardware_jacinto6evm.xml b/tablet_core_hardware_jacinto6evm.xml
index e74afc1..eca9205 100644
--- a/tablet_core_hardware_jacinto6evm.xml
+++ b/tablet_core_hardware_jacinto6evm.xml
@@ -33,4 +33,5 @@
     <!-- 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>