changes for ads-7.0.1

17 files changed, 250 insertions, 170 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 00a56146558..0be19753e4e 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,3 +1,2 @@
 PRODUCT_MAKEFILES := \
-	$(LOCAL_DIR)/aosp_tilapia.mk \
-	$(LOCAL_DIR)/full_tilapia.mk
+	$(LOCAL_DIR)/aosp_tilapia.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9b32501a3e0..2b99c37f988 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -28,7 +28,6 @@
 # the true camera library when the vendor tree is available.  Similarly,
 # we set USE_PROPRIETARY_AUDIO_EXTENSIONS to true in the proprietary variant as
 # well.
-
 USE_CAMERA_STUB := true
 USE_PROPRIETARY_AUDIO_EXTENSIONS := false
 
@@ -42,5 +41,20 @@ include device/asus/grouper/BoardConfigCommon.mk
 
 TARGET_RECOVERY_FSTAB = device/asus/tilapia/fstab.grouper
 
-MALLOC_SVELTE := true
+#BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 1
+TARGET_DISABLE_ARM_PIE := true
+TARGET_GLOBAL_CFLAGS += -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hardfp -gtoggle -s -DNDEBUG -march=armv7-a -mthumb -O2 -funroll-loops -mimplicit-it=always -mno-warn-deprecated -mauto-it --disable-docs -mtls-dialect=gnu2 --param l1-cache-size=32 --param l1-cache-line-size=32 --param l2-cache-size=1024 --param simultaneous-prefetches=6 --param prefetch-latency=400 -mvectorize-with-neon-quad
+TARGET_GLOBAL_CPPFLAGS += -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hardfp -gtoggle -s -DNDEBUG -O2 -funroll-loops -mthumb -march=armv7-a -mimplicit-it=always -mno-warn-deprecated -mauto-it --disable-docs -mtls-dialect=gnu2 --param l1-cache-size=32 --param l1-cache-line-size=32 --param l2-cache-size=1024 --param simultaneous-prefetches=6 --param prefetch-latency=400 -mvectorize-with-neon-quad
+TARGET_BOOTANIMATION_PRELOAD := true 
+BOARD_SKIP_ANDROID_DOC_BUILD := true
+DISABLE_DROIDDOC := true
+TARGET_BOOTANIMATION_TEXTURE_CACHE := false
+TARGET_ENABLE_NON_PIE_SUPPORT := true
+WITH_DEXPREOPT := false
+HWUI_COMPILE_FOR_PERF := true
+$(call add-product-dex-preopt-module-config,services,--compiler-filter=everything)
+PRODUCT_PROPERTY_OVERRIDES += \
+dalvik.vm.dex2oat-flags=--no-watch-dog \
+dalvik.vm.dex2oat-filter=everything \
+dalvik.vm.image-dex2oat-filter=everything
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 06c0718ec33..9a049aee775 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,4 +47,6 @@
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(TARGET_OUT)/etc/permissions/android.hardware.bluetooth_le.xml)
diff --git a/aosp_tilapia.mk b/aosp_tilapia.mk
index 4fdd7eee36f..e9a1471d4ff 100644
--- a/aosp_tilapia.mk
+++ b/aosp_tilapia.mk
@@ -13,6 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, device/asus/tilapia/full_tilapia.mk)
 
-PRODUCT_NAME := aosp_tilapia
+# Inherit from those products. Most specific first.
+$(call inherit-product, device/asus/tilapia/device.mk)
+# This is where we'd set a backup provider if we had one
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
+
+PRODUCT_NAME   := aosp_tilapia
+PRODUCT_DEVICE := tilapia
+PRODUCT_BRAND  := Google
+PRODUCT_MODEL  := Nexus 7 3G
+PRODUCT_MANUFACTURER := Asus
diff --git a/device.mk b/device.mk
index b2d83cf7eb2..0677719bf8d 100644
--- a/device.mk
+++ b/device.mk
@@ -22,14 +22,15 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES := \
     device/asus/tilapia/fstab.grouper:root/fstab.grouper \
-    device/asus/tilapia/init.recovery.tilapia.rc:root/init.recovery.grouper.rc \
     device/asus/tilapia/init.tilapia.rc:root/init.grouper.rc
 
-DEVICE_PACKAGE_OVERLAYS := \
-    device/asus/tilapia/overlay
-
 # the actual meat of the device-specific product definition
 $(call inherit-product, device/asus/grouper/device-common.mk)
 
-# inherit from the non-open-source side, if present
-$(call inherit-product-if-exists, vendor/asus/tilapia/device-vendor.mk)
+DEVICE_PACKAGE_OVERLAYS := \
+    device/asus/tilapia/overlay
+
+VENDOR_FOLDER := vendor/asus/tilapia
+PRODUCT_COPY_FILES += \
+	$(VENDOR_FOLDER)/proprietary/vendor/lib/libxgold-ril.so:system/lib/libxgold-ril.so \
+	$(VENDOR_FOLDER)/proprietary/etc/apns-conf.xml:system/etc/apns-conf.xml
diff --git a/fstab.grouper b/fstab.grouper
index 13f4e09a56e..1745038493e 100644
--- a/fstab.grouper
+++ b/fstab.grouper
@@ -15,4 +15,5 @@
 /dev/block/platform/sdhci-tegra.3/by-name/USP           /staging            emmc      defaults                                                      defaults
 /dev/block/platform/sdhci-tegra.3/by-name/RDO           /radio              ext4      defaults                                                      recoveryonly
 /dev/block/zram0					none                swap      defaults zramsize=104857600
-/devices/platform/tegra-ehci.0/usb*                     auto                vfat      defaults        voldmanaged=usb:auto
+/devices/platform/tegra-ehci.0/usb*                     auto                auto      defaults        voldmanaged=usbdisk:auto
+
diff --git a/full_tilapia.mk b/full_tilapia.mk
deleted file mode 100644
index 0aff0160f8c..00000000000
--- a/full_tilapia.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# This file is the build configuration for a full Android
-# build for grouper hardware. This cleanly combines a set of
-# device-specific aspects (drivers) with a device-agnostic
-# product configuration (apps).
-#
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, device/asus/tilapia/device.mk)
-# This is where we'd set a backup provider if we had one
-#$(call inherit-product, device/sample/products/backup_overlay.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
-
-# Discard inherited values and use our own instead.
-PRODUCT_NAME := full_tilapia
-PRODUCT_DEVICE := tilapia
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := Nexus 7 3G
-PRODUCT_MANUFACTURER := Asus
diff --git a/init.tilapia.rc b/init.tilapia.rc
index f7be7ac7296..9eb5100a20f 100644
--- a/init.tilapia.rc
+++ b/init.tilapia.rc
@@ -4,9 +4,7 @@ on early-init
     mount debugfs debugfs /sys/kernel/debug
 
 on init
-    # Set init and its forked children's oom_adj.
-    write /proc/1/oom_score_adj -1000
-    mount debugfs debugfs /sys/kernel/debug
+    symlink /sdcard /storage/sdcard0
 
 on early-boot
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
@@ -15,15 +13,11 @@ on early-boot
     write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
 
 on fs
-    mkdir /factory 0775 radio radio
-
     setprop ro.crypto.umount_sd false
     mount_all /fstab.grouper
-    swapon_all /fstab.grouper
+#    swapon_all /fstab.grouper
 
 on post-fs-data
-    mkdir /data/media 0770 media_rw media_rw
-
     # change back to bluetooth from system
     chown bluetooth net_bt_stack /data/misc/bluetooth
 
@@ -38,9 +32,18 @@ on post-fs-data
     chown root root /data/lightsensor
     mkdir /data/calibration
     mkdir /data/amit
-    
-    mkdir /data/radio 0775 radio radio
-    mkdir /data/radio/log 0775 radio radio
+
+    # gps
+    mkdir /data/gps
+    chown gps system /data/gps
+    chmod 1770 /data/gps
+    write /sys/class/gpio/export 162
+    write /sys/class/gpio/gpio162/value 0
+    write /sys/class/gpio/gpio162/direction out
+    chown gps system /sys/class/gpio/gpio162/value
+    chmod 0644 /sys/class/gpio/gpio162/value
+    chown gps system /dev/ttyHS1
+    chmod 0660 /dev/ttyHS1
 
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1
@@ -262,22 +265,26 @@ on boot
     chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/max_boost
     chown system system /sys/devices/system/cpu/cpufreq/interactive/sustain_load
     chmod 0660 /sys/devices/system/cpu/cpufreq/interactive/sustain_load
+    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+    chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+    chown system system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+    chmod 0660 /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
+    chown system system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
+    chmod 0660 /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
+    chown system system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq
+    chmod 0660 /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq
+    chown system system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq
+    chmod 0660 /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq
+    chown system system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq
+    chmod 0660 /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq
+    chown system system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq
+    chmod 0660 /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq
+    chown system system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq
+    chmod 0660 /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq
 
 # Default Read Ahead value for sdcards
-    write /sys/block/mmcblk0/queue/read_ahead_kb 2048
-    write /sys/block/mmcblk1/queue/read_ahead_kb 2048
-
-# GPS init
-    write /sys/class/gpio/export 162
-    write /sys/class/gpio/gpio162/value 0
-    write /sys/class/gpio/gpio162/direction out
-    chown gps system /sys/class/gpio/gpio162/value
-    chmod 0664 /sys/class/gpio/gpio162/value
-    mkdir /data/gps
-    chown gps system /data/gps
-    chmod 1770 /data/gps
-    chown gps system /dev/ttyHS1
-    chmod 0660 /dev/ttyHS1
+    write /sys/block/mmcblk0/queue/read_ahead_kb 128
+    write /sys/block/mmcblk1/queue/read_ahead_kb 128
 
 # ril
     chown radio system /sys/devices/virtual/ril/files/crash_dump_onoff
@@ -296,7 +303,7 @@ on boot
 
 # Touch
     chown system system /dev/elan-iap
-    chown system system /proc/ektf_dbg
+    chown system system /proc/ektf_dbg  
     start touch_fw_update
 
 # the following settings are used to disable ipv6 on cellular networks that cannot
@@ -323,6 +330,25 @@ on property:ril.ipv6.rmnet1.enable=0
     write /proc/sys/vm/page-cluster 0
     write /proc/sys/vm/swappiness 100
 
+# some additional performance tweaks (to be tested)
+	setprop dalvik.vm.heapgrowthlimit 128m
+	setprop dalvik.vm.heapsize 174m
+	write /sys/module/lowmemorykiller/parameters/adj "0,1,2,4,7,15"
+	write /sys/module/lowmemorykiller/parameters/minfree "8192,10240,12288,14336,16384,20480"
+	write /sys/module/lowmemorykiller/parameters/cost 48
+	write /proc/sys/vm/highmem_is_dirtyable 1
+	write /sys/block/mmcblk0/queue/nr_requests 512
+	write /sys/block/mmcblk0/queue/add_random 0
+	write /sys/block/mmcblk0/queue/rq_affinity 2
+	write /sys/block/mmcblk0/queue/iosched/slice_idle 0
+	write /sys/block/mmcblk0/queue/iosched/group_idle 10
+	write /sys/block/mmcblk0/queue/iosched/back_seek_penalty 1
+	write /sys/block/mmcblk0/queue/iosched/quantum 16
+	write /sys/block/mmcblk0/queue/iosched/slice_async_rq 4
+	write /sys/block/mmcblk0/queue/iosched/back_seek_max 2147483647
+	write /sys/devices/tegradc.0/smartdimmer/enable 0
+	write /sys/devices/host1x/gr3d/enable_3d_scaling 1
+
 service wpa_supplicant /system/bin/wpa_supplicant \
     -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
     -I/system/etc/wifi/wpa_supplicant_overlay.conf \
@@ -393,7 +419,7 @@ service iprenew_bt-pan /system/bin/dhcpcd -n
     oneshot
 
 #Sensor: load calibration files.
-service sensors-config /system/bin/sensors-config
+    service sensors-config /system/bin/sensors-config
     class main
     user root
     oneshot
@@ -408,10 +434,11 @@ service bugreport /system/bin/dumpstate -d -p -B \
     keycodes 115 114
 
 # Start GPS daemon
-service gps-daemon /system/bin/gps_daemon.sh
-  user gps
-  group system
-  class late_start
+service gpsd /vendor/bin/gpsd -c /system/etc/gps.xml
+    class main
+    socket gps seqpacket 0660 gps system
+    user gps
+    group system wakelock inet sdcard_rw
 
 # Recovery daemon: configure MSC partition
 service recoveryd /system/bin/recoveryd /dev/block/platform/sdhci-tegra.3/by-name/MSC
@@ -424,8 +451,11 @@ service recoveryd /system/bin/recoveryd /dev/block/platform/sdhci-tegra.3/by-nam
 on property:sys.shutdown.requested=1recovery
     start recoveryd
 
+on property:ro.build.type=userdebug
+    start adbd
+
 # start tf_daemon service
-service tf_daemon /system/bin/tf_daemon -storageDir /data/tf -d
+service tf_daemon /vendor/bin/tf_daemon -storageDir /data/tf -d
     class main
     user root
     group shell
@@ -434,15 +464,6 @@ service tf_daemon /system/bin/tf_daemon -storageDir /data/tf -d
 on property:init.svc.tf_daemon=restarting
     mkdir /data/tf
 
-# create filesystems if necessary
-service setup_fs /system/bin/setup_fs \
-        /dev/block/platform/sdhci-tegra.3/by-name/UDA \
-        /dev/block/platform/sdhci-tegra.3/by-name/CAC
-    class core
-    user root
-    group root
-    oneshot
-
 service touch_fw_update /system/bin/touch_fw_update.sh
     class main
     disabled
@@ -450,3 +471,4 @@ service touch_fw_update /system/bin/touch_fw_update.sh
     group root
     oneshot
 
+
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index df15685b125..eb23fc6407b 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -54,7 +54,6 @@
         <item>"9,1"</item>
     </string-array>
 
-
     <!-- List of regexpressions describing the interface (if any) that represent tetherable
          USB interfaces.  If the device doesn't want to support tething over USB this should
          be empty.  An example would be "usb.*" -->
@@ -215,6 +214,13 @@
           -->
     <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
 
+    <string-array name="config_locationProviderPackageNames" translatable="false">
+        <!-- The Google provider -->
+        <item>com.google.android.gms</item>
+        <!-- The standard AOSP fused location provider -->
+        <item>com.android.location.fused</item>
+    </string-array>
+
     <!-- Separate software navigation bar required on this device. -->
     <bool name="config_showNavigationBar">true</bool>
 
@@ -242,8 +248,16 @@
     <integer name="config_safe_media_volume_index">6</integer>
 
     <!-- Set lowmemorykiller threshold -->
-    <integer name="config_lowMemoryKillerMinFreeKbytesAbsolute">16384</integer>
+    <integer name="config_lowMemoryKillerMinFreeKbytesAbsolute">-1</integer>
+    <integer name="config_lowMemoryKillerMinFreeKbytesAdjust">0</integer>
 
     <!-- Enable doze powersaving -->
     <bool name="config_enableAutoPowerModes">true</bool>
+
+    <string-array name="config_locationProviderPackageNames" translatable="false">
+        <!-- GMS location provider -->
+        <item>com.google.android.gms</item>
+        <!-- The standard AOSP fused location provider -->
+        <item>com.android.location.fused</item>
+    </string-array>
 </resources>
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
deleted file mode 100644
index 344fe1e109e..00000000000
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- See storage config details at http://source.android.com/tech/storage/ -->
-
-<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- internal emulated storage -->
-    <storage
-        android:storageDescription="@string/storage_internal"
-        android:emulated="true"
-        android:mtpReserve="100" />
-</StorageList>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index f5439d516a8..fd923e0313a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
 <resources>
 
     <!-- Control whether status bar should distinguish HSPA data icon form UMTS
@@ -32,10 +28,31 @@
     <!-- Show camera affordance on Keyguard -->
     <bool name="config_keyguardShowCameraAffordance">false</bool>
 
-    <!-- Disable expensive shadows -->
-    <bool name="config_recents_fake_shadows">true</bool>
-
     <!-- Use hardware layers in recents -->
     <bool name="config_recents_use_hardware_layers">true</bool>
-</resources>
 
+    <!-- Doze: does this device support STATE_DOZE and STATE_DOZE_SUSPEND?  -->
+    <bool name="doze_display_state_supported">true</bool>
+
+    <!-- Doze: should the pickup sensor be used as a pulse signal? -->
+    <bool name="doze_pulse_on_pick_up">true</bool>
+
+    <!-- Doze: shake accelerometer threshold -->
+    <integer name="doze_shake_accelerometer_threshold">10</integer>
+
+     <!-- Doze: when to pulse after a buzzworthy notification arrives -->
+    <string name="doze_pulse_schedule" translatable="false">1s,5s,10s,30s,60s</string>
+
+    <!-- Doze: pulse parameter - how long does it take to fade in after an intent? -->
+    <integer name="doze_pulse_duration_in_intent">0</integer>
+
+    <!-- Doze: pulse parameter - delay to wait for the screen to wake up after an intent -->
+    <integer name="doze_pulse_delay_in_intent">0</integer>
+
+    <!-- Doze: pulse parameter - delay to wait for the screen to wake up -->
+    <integer name="doze_pulse_delay_in">100</integer>
+
+    <!-- Doze: pulse parameter - how long does it take to fade in? -->
+    <integer name="doze_pulse_duration_in">100</integer>
+
+</resources>
diff --git a/overlay/packages/apps/Bluetooth/res/values/config.xml b/overlay/packages/apps/Bluetooth/res/values/config.xml
new file mode 100644
index 00000000000..df47017fa9e
--- /dev/null
+++ b/overlay/packages/apps/Bluetooth/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009-2012 Broadcom Corporation
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<resources>
+    <!-- Whether the device support Bluetooth MAP profile -->
+    <bool name="profile_supported_map">false</bool>
+</resources>
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
index 2538661acdb..7a36522fd41 100644
--- a/overlay/packages/apps/Settings/res/values/bools.xml
+++ b/overlay/packages/apps/Settings/res/values/bools.xml
@@ -15,9 +15,6 @@
 -->
 
 <resources>
-    <!-- No powercontrol widget for tablets -->
-    <bool name="has_powercontrol_widget">true</bool>
-
     <!-- Show dock settings when docked -->
     <bool name="has_dock_settings">true</bool>
 
diff --git a/overlay/packages/wallpapers/MusicVisualization/res/values/config.xml b/overlay/packages/wallpapers/MusicVisualization/res/values/config.xml
new file mode 100644
index 00000000000..2fe6f53aca0
--- /dev/null
+++ b/overlay/packages/wallpapers/MusicVisualization/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+* Copyright (C) 2010 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <bool name="config_enable_vis1">false</bool>
+    <bool name="config_enable_vis2">false</bool>
+    <bool name="config_enable_vis3">true</bool>
+    <bool name="config_enable_vis4">false</bool>
+    <bool name="config_enable_vis5">false</bool>
+
+</resources>
+
diff --git a/self-extractors/nvidia/staging/keymaster/Android.mk b/self-extractors/nvidia/staging/keymaster/Android.mk
index 43c0f5e04db..bc80f3f6ff8 100644
--- a/self-extractors/nvidia/staging/keymaster/Android.mk
+++ b/self-extractors/nvidia/staging/keymaster/Android.mk
@@ -28,7 +28,6 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
 	libcore/include \
-	external/openssl/include \
 	$(LOCAL_PATH)/../security/tf_sdk/include
 
 LOCAL_CFLAGS := -fvisibility=hidden -Wall -Werror
diff --git a/self-extractors/nvidia/staging/keymaster/keymaster_grouper.cpp b/self-extractors/nvidia/staging/keymaster/keymaster_grouper.cpp
index 978c5be7e94..37f306a8262 100644
--- a/self-extractors/nvidia/staging/keymaster/keymaster_grouper.cpp
+++ b/self-extractors/nvidia/staging/keymaster/keymaster_grouper.cpp
@@ -25,7 +25,7 @@
 #include <cutils/log.h>
 
 #include <hardware/hardware.h>
-#include <hardware/keymaster.h>
+#include <hardware/keymaster0.h>
 
 #include <openssl/bn.h>
 #include <openssl/err.h>
@@ -67,7 +67,7 @@ struct PKCS8_PRIV_KEY_INFO_Delete {
 };
 typedef UniquePtr<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_Delete> Unique_PKCS8_PRIV_KEY_INFO;
 
-typedef UniquePtr<keymaster_device_t> Unique_keymaster_device_t;
+typedef UniquePtr<keymaster0_device_t> Unique_keymaster_device_t;
 
 typedef UniquePtr<CK_BYTE[]> Unique_CK_BYTE;
 
@@ -327,7 +327,7 @@ static int keyblob_restore(const CryptoSession* session, const uint8_t* keyBlob,
             || find_single_object(p, ID_LENGTH, CKO_PRIVATE_KEY, session, private_key);
 }
 
-static int tee_generate_keypair(const keymaster_device_t* dev,
+static int tee_generate_keypair(const keymaster0_device_t* dev,
         const keymaster_keypair_t type, const void* key_params,
         uint8_t** key_blob, size_t* key_blob_length) {
     CK_BBOOL bTRUE = CK_TRUE;
@@ -406,7 +406,7 @@ static int tee_generate_keypair(const keymaster_device_t* dev,
     return keyblob_save(objId.get(), key_blob, key_blob_length);
 }
 
-static int tee_import_keypair(const keymaster_device_t* dev,
+static int tee_import_keypair(const keymaster0_device_t* dev,
         const uint8_t* key, const size_t key_length,
         uint8_t** key_blob, size_t* key_blob_length) {
     CK_RV rv;
@@ -610,7 +610,7 @@ static int tee_import_keypair(const keymaster_device_t* dev,
     return keyblob_save(objId.get(), key_blob, key_blob_length);
 }
 
-static int tee_get_keypair_public(const struct keymaster_device* dev,
+static int tee_get_keypair_public(const keymaster0_device_t* dev,
         const uint8_t* key_blob, const size_t key_blob_length,
         uint8_t** x509_data, size_t* x509_data_length) {
 
@@ -722,7 +722,7 @@ static int tee_get_keypair_public(const struct keymaster_device* dev,
     return 0;
 }
 
-static int tee_delete_keypair(const struct keymaster_device* dev,
+static int tee_delete_keypair(const keymaster0_device_t* dev,
             const uint8_t* key_blob, const size_t key_blob_length) {
 
     CryptoSession session(reinterpret_cast<CK_SESSION_HANDLE>(dev->context));
@@ -751,7 +751,7 @@ static int tee_delete_keypair(const struct keymaster_device* dev,
     return 0;
 }
 
-static int tee_sign_data(const keymaster_device_t* dev,
+static int tee_sign_data(const keymaster0_device_t* dev,
         const void* params,
         const uint8_t* key_blob, const size_t key_blob_length,
         const uint8_t* data, const size_t dataLength,
@@ -821,7 +821,7 @@ static int tee_sign_data(const keymaster_device_t* dev,
     return 0;
 }
 
-static int tee_verify_data(const keymaster_device_t* dev,
+static int tee_verify_data(const keymaster0_device_t* dev,
         const void* params,
         const uint8_t* keyBlob, const size_t keyBlobLength,
         const uint8_t* signedData, const size_t signedDataLength,
@@ -877,7 +877,7 @@ static int tee_verify_data(const keymaster_device_t* dev,
 
 /* Close an opened OpenSSL instance */
 static int tee_close(hw_device_t *dev) {
-    keymaster_device_t *keymaster_dev = (keymaster_device_t *) dev;
+    keymaster0_device_t *keymaster_dev = (keymaster0_device_t *) dev;
     if (keymaster_dev != NULL) {
         CK_SESSION_HANDLE handle = reinterpret_cast<CK_SESSION_HANDLE>(keymaster_dev->context);
         if (handle != CK_INVALID_HANDLE) {
@@ -902,7 +902,7 @@ static int tee_open(const hw_module_t* module, const char* name,
     if (strcmp(name, KEYSTORE_KEYMASTER) != 0)
         return -EINVAL;
 
-    Unique_keymaster_device_t dev(new keymaster_device_t);
+    Unique_keymaster_device_t dev(new keymaster0_device_t);
     if (dev.get() == NULL)
         return -ENOMEM;
 
diff --git a/system.prop b/system.prop
index f0686828aa5..5544778a98f 100644
--- a/system.prop
+++ b/system.prop
@@ -17,20 +17,40 @@ ro.zygote.disable_gl_preload=true
 
 # configure PRISM
 persist.tegra.didim.video = 5
-
-
-#lpa.use-stagefright=false
-
-
-#permit dex2oat to run more than 6 minutes. comment if you prefer to keep the watchdog
-dalvik.vm.dex2oat-flags=--no-watch-dog
-
-dalvik.vm.dexopt-flags=m=y
-dalvik.vm.heapstartsize=8m
-dalvik.vm.heapgrowthlimit=64m
-dalvik.vm.heapsize=256m
-dalvik.vm.heaputilization=0.25
-dalvik.vm.heapidealfree=8388608
-dalvik.vm.heapconcurrentstart=2097152
-dalvik.vm.stack-trace-file=/data/anr/traces.txt
+persist.tegra.didim.enable = 1
+persist.tegra.didim.normal = 3
+# Dalvik and other tweaks
+dalvik.vm.heapgrowthlimit=128m
+dalvik.vm.heapsize=174m
+dalvik.vm.verify-bytecode=false
+persist.adb.notify=0
+ro.kernel.android.checkjni=0
+ro.kernel.checkjni=0
+dalvik.vm.checkjni=false
+ro.ril.disable.power.collapse=0
+pm.sleep_mode=1
+ro.config.hw_power_saving=true
+ro.sys.fw.bg_apps_limit=10
+persist.debug.wfd.enable=1
+persist.sys.force_highendgfx=true
+config.disable_atlas=true
+ro.config.max_starting_bg=8
+
+# Disable strict mode checking
+persist.android.strictmode=0
+
+# 16bit Transparency
+persist.sys.use_16bpp_alpha=1
+
+#config low ram device
+#ro.config.low_ram=true
+
+#disable scrolling cache (1 = on, 2 = sometimes on, 3 = sometimes off, 4 = allways off)
+persist.sys.scrollingcache=4
+
+#debug flags
+ro.adb.secure=0
+ro.debuggable=1
+persist.service.adb.enable=1
+persist.sys.usb.config=mtp,adb