Merge remote-tracking branch 'google/marshmallow-release' into cm-13.0

Change-Id: I37c2eb3fdc04626b7ce30f423104321d1e987c6b

device.mk

@@ -17,6 +17,7 @@
 # rild
 PRODUCT_PACKAGES := \
     rild \
+    CarrierConfig \
     BasicSmsReceiver
 
 PRODUCT_COPY_FILES := \
@@ -37,10 +38,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
         persist.radio.apm_sim_not_pwdn=1
 
-#Stop rild if non 3G SKU
-PRODUCT_PACKAGES += \
-        init.qcom.class_main.sh
-
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
         rild.libpath=/system/lib/libril-qc-qmi-1.so
 

fstab.deb

@@ -23,4 +23,4 @@
 /dev/block/platform/msm_sdcc.1/by-name/tzb          /tzb            emmc    defaults                                                                                            defaults
 /dev/block/platform/msm_sdcc.1/by-name/rpmb         /rpmb           emmc    defaults                                                                                            defaults
 /dev/block/platform/msm_sdcc.1/by-name/abootb       /abootb         emmc    defaults                                                                                            defaults
-/devices/platform/msm_hsusb_host/usb                auto            auto    defaults                                                                                            voldmanaged=usbdisk:auto,noemulatedsd
+/devices/platform/msm_hsusb_host/usb*               auto            auto    defaults                                                                                            voldmanaged=usb:auto,noemulatedsd

init.deb.rc

@@ -24,24 +24,9 @@ on early-init
     symlink /data/tombstones /tombstones
 
 on init
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-
-    # USB storage
-    mkdir /mnt/media_rw/usbdisk 0700 media_rw media_rw
-    mkdir /storage/usbdisk 0700 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-    export SECONDARY_STORAGE /storage/usbdisk
-
     # Support legacy paths
-    symlink /storage/emulated/legacy /sdcard
+    symlink /sdcard /mnt/sdcard
-    symlink /storage/emulated/legacy /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
-    symlink /storage/emulated/legacy /storage/sdcard0
-    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
 
     # Set permissions for persist partition
     mkdir /persist 0771 system system
@@ -50,7 +35,6 @@ on init
 on fs
     mount_all ./fstab.flo
     restorecon_recursive /persist
-    setprop ro.crypto.fuse_sdcard true
     write /sys/kernel/boot_adsp/boot 1
 
 on early-boot
@@ -74,9 +58,6 @@ on boot
     # java.io.FileNotFoundException: /proc/cmdline: open failed: EACCES (Permission denied)
     chmod 0644 /proc/cmdline
 
-    #Remove SUID bit for iproute2 ip tool
-    chmod 0755 /system/bin/ip
-
     #port-bridge
     chmod 0660 /dev/smd0
     chown system system /dev/smd0
@@ -143,12 +124,9 @@ on boot
 
 # msm specific files that need to be created on /data
 on post-fs-data
-    mkdir /data/media 0770 media_rw media_rw
-
     chown system system /dev/wcnss_wlan
     write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
 
-    mkdir /data/tombstones 0771 system system
     mkdir /tombstones/modem 0771 system system
     mkdir /tombstones/lpass 0771 system system
     mkdir /tombstones/wcnss 0771 system system
@@ -245,11 +223,10 @@ service rmt_storage /system/bin/rmt_storage
     user root
     group system
 
-service hciattach /system/bin/sh /system/etc/init.flo.bt.sh
+service hciattach /system/bin/init.flo.bt.sh
     class late_start
     user bluetooth
     group qcom_oncrpc bluetooth net_bt_admin system net_bt_stack
-    seclabel u:r:bluetooth_loader:s0
     disabled
     oneshot
 
@@ -270,10 +247,9 @@ service qmuxd /system/bin/qmuxd
     user radio
     group radio audio bluetooth gps net_bt_stack
 
-service ks_checker /system/bin/sh /system/etc/kickstart_checker.sh
+service ks_checker /system/bin/kickstart_checker.sh
     class core
     group system
-    seclabel u:r:kickstart:s0
     oneshot
 
 service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
@@ -283,10 +259,6 @@ service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
     disabled
     oneshot
 
-service asus-dbug-d /data/data/com.asus.debugger/files/asus-debugger-d
-    class late_start
-    disabled
-
 on property:gsm.radio.kickstart=on
     start kickstart
     setprop gsm.radio.kickstart running
@@ -394,15 +366,6 @@ service charger /sbin/healthd -c
     critical
     seclabel u:r:healthd:s0
 
-# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
-    class late_start
-
-# USB-OTG storage daemon
-service fuse_usbdisk /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/usbdisk /storage/usbdisk
-    class late_start
-    disabled
-
 service thermald /system/bin/thermald
     class main
     group radio system
@@ -417,11 +380,10 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
     user camera
     group camera system inet input
 
-service wcnss_init /system/bin/sh /system/etc/init.flo.wifi.sh
+service wcnss_init /system/bin/init.flo.wifi.sh
     class late_start
     user system
     group system wifi
-    seclabel u:r:conn_init:s0
     oneshot
 
 service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x

overlay/frameworks/base/core/res/res/values/config.xml

@@ -311,4 +311,12 @@
          config to 7. -->
     <integer name="config_deviceHardwareWakeKeys">64</integer>
 
+    <!-- The RadioAccessFamilies supported by the device.
+         Empty is viewed as "all".  Only used on devices which
+         don't support RIL_REQUEST_GET_RADIO_CAPABILITY
+         format is UMTS|LTE|... -->
+    <string translatable="false" name="config_radio_access_family">GSM | WCDMA | LTE</string>
+
+    <!-- Flag indicating if device supports EAP SIM, AKA, AKA' -->
+    <bool name="config_eap_sim_based_auth_supported">false</bool>
 </resources>

overlay/frameworks/base/core/res/res/xml/power_profile.xml

@@ -28,6 +28,8 @@
     <item name="wifi.scan">52.1</item>
     <item name="dsp.audio">0.1</item>
     <item name="dsp.video">0.1</item>
+    <item name="camera.flashlight">0</item> <!-- Avg. power for camera flash, ~160mA -->
+    <item name="camera.avg">747.67</item> <!-- Avg. power use of camera in standard usecases, ~550mA -->
     <item name="gps.on">59.7</item>
     <item name="radio.active">185.6</item>
     <!-- The current consumed by the radio when it is scanning for a signal -->

overlay/packages/apps/CarrierConfig/res/xml/vendor.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<!-- This is a place for device-specific config values. The format and
+     filtering rules are the same as those in carrier_config*.xml files. This
+     file is read after any specific config file from the assets folder, so it
+     must use explicit filters for MCC ad MNC if that is desired. -->
+<carrier_config_list>
+    <carrier_config mcc="311" mnc="480">
+        <boolean name="apn_expand_bool" value="false" />
+    </carrier_config>
+</carrier_config_list>

overlay/packages/apps/Nfc/res/values/provisioning.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<!-- NFC resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- The accepted mime-types when NFC is enabled in setup wizard.
-         Mime-types must be lower case, wildcards are *not* accepted. -->
-    <string-array name="provisioning_mime_types">
-        <item>application/vnd.com.google.android.nfcprovision</item>
-        <item>application/com.android.managedprovisioning</item>
-    </string-array>
-</resources>

releasetools.py

@@ -42,6 +42,13 @@ def IncrementalOTA_VerifyEnd(info):
         len(target_radio_img), common.sha1(target_radio_img).hexdigest()))
 
 
+def IncrementalOTA_InstallBegin(info):
+  # Reduce the space taken by the journal.
+  info.script.Unmount("/system")
+  info.script.TunePartition("/system", "-O", "^has_journal")
+  info.script.Mount("/system")
+
+
 def IncrementalOTA_InstallEnd(info):
   try:
     target_bootloader_img = info.target_zip.read("RADIO/bootloader.img")