From 897bf6607e0f079d0fd9a83371942a2e4e39b952 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Wed, 8 Jun 2016 01:45:31 +0800
Subject: [PATCH] Android-x86 6.0-rc1 release (20160608)

---
 BoardConfig.mk                                     |  1 -
 device.mk                                          |  1 +
 fstab.x86                                          |  4 +++-
 init.sh                                            |  2 ++
 .../base/core/res/res/xml/storage_list.xml         | 25 ----------------------
 .../apps/Trebuchet/res/values-sw340dp/config.xml   |  3 ---
 packages.mk                                        |  1 +
 7 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 overlay/packages/apps/Trebuchet/res/values-sw340dp/config.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 45b9dd9..3393768 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,7 +19,6 @@ BOARD_MALLOC_ALIGNMENT := 16
 ifeq ($(HOST_OS),linux)
 WITH_DEXPREOPT := true
 WITH_DEXPREOPT_PIC := true
-TARGET_GCC_VERSION_EXP := 4.9
 endif
 
 # the following variables could be overridden
diff --git a/device.mk b/device.mk
index bb3c1e0..95001d8 100644
--- a/device.mk
+++ b/device.mk
@@ -43,6 +43,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/media_codecs.xml:system/etc/media_codecs.xml \
     $(LOCAL_PATH)/media_profiles.xml:system/etc/media_profiles.xml \
     device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \
+    device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
     frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \
diff --git a/fstab.x86 b/fstab.x86
index f2f61c8..44de82f 100644
--- a/fstab.x86
+++ b/fstab.x86
@@ -1,3 +1,5 @@
 none			/cache		tmpfs	nosuid,nodev,noatime	defaults
 
-/devices/*/usb*/*	auto		auto	defaults		voldmanaged=usb:auto
+/devices/*/usb*/*		auto	auto	defaults		voldmanaged=usb:auto,encryptable=userdata
+/devices/*/*sdmmc*/*		auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/80860F14:01/mmc_*	auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
diff --git a/init.sh b/init.sh
index 2a2dc3d..4bb9c40 100644
--- a/init.sh
+++ b/init.sh
@@ -137,6 +137,8 @@ function init_hal_gralloc()
 			init_uvesafb
 			;&
 		0*)
+			# FIXME: software rendering failed to pass the SetupWizard
+			set_property ro.setupwizard.mode DISABLED
 			;;
 	esac
 
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 66984e8..73c0766 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -26,29 +26,4 @@
         android:primary="true"
         android:emulated="true"
         android:mtpReserve="100" />
-    <storage
-        android:mountPoint="/storage/sdcard1"
-        android:storageDescription="@string/storage_sd_card"
-        android:removable="true"
-        android:maxFileSize="4096" />
-    <storage
-        android:mountPoint="/storage/usb0"
-        android:storageDescription="@string/storage_usb"
-        android:removable="true"
-        android:maxFileSize="4096" />
-    <storage
-        android:mountPoint="/storage/usb1"
-        android:storageDescription="@string/storage_usb"
-        android:removable="true"
-        android:maxFileSize="4096" />
-    <storage
-        android:mountPoint="/storage/usb2"
-        android:storageDescription="@string/storage_usb"
-        android:removable="true"
-        android:maxFileSize="4096" />
-    <storage
-        android:mountPoint="/storage/usb3"
-        android:storageDescription="@string/storage_usb"
-        android:removable="true"
-        android:maxFileSize="4096" />
 </StorageList>
diff --git a/overlay/packages/apps/Trebuchet/res/values-sw340dp/config.xml b/overlay/packages/apps/Trebuchet/res/values-sw340dp/config.xml
deleted file mode 100644
index c01c4df..0000000
--- a/overlay/packages/apps/Trebuchet/res/values-sw340dp/config.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <bool name="config_largeIcons">false</bool>
-</resources>
diff --git a/packages.mk b/packages.mk
index 20832d9..a32c144 100644
--- a/packages.mk
+++ b/packages.mk
@@ -79,3 +79,4 @@ PRODUCT_PACKAGES += \
 # Third party apps
 PRODUCT_PACKAGES += \
     CMFileManager \
+    Eleven \
-- 
2.11.0