am f0821521: Merge "RazorG: Reduce the journal size to zero."
* commit 'f08215219732849e16a05f374aec72d7811589ec':
RazorG: Reduce the journal size to zero.
diff --git a/device.mk b/device.mk
index 5756795..42bbaa8 100644
--- a/device.mk
+++ b/device.mk
@@ -30,10 +30,6 @@
PRODUCT_PACKAGES += \
nfc_nci.bcm2079x.default
-# http://b/15193147
-# TODO(danalbert): Remove this once stlport is dead and gone.
-PRODUCT_PACKAGES += libstlport
-
# Do not power down SIM card when modem is sent to Low Power Mode.
PRODUCT_PROPERTY_OVERRIDES += \
persist.radio.apm_sim_not_pwdn=1
diff --git a/fstab.deb b/fstab.deb
index e91ad31..c45e0fe 100644
--- a/fstab.deb
+++ b/fstab.deb
@@ -23,3 +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=usb:auto
diff --git a/init.deb.rc b/init.deb.rc
index f30722e..ae0b6d7 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -23,19 +23,9 @@
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
-
- export EXTERNAL_STORAGE /storage/emulated/legacy
- export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
- export EMULATED_STORAGE_TARGET /storage/emulated
-
# Support legacy paths
- symlink /storage/emulated/legacy /sdcard
- symlink /storage/emulated/legacy /mnt/sdcard
- symlink /storage/emulated/legacy /storage/sdcard0
- symlink /mnt/shell/emulated/0 /storage/emulated/legacy
+ symlink /sdcard /mnt/sdcard
+ symlink /sdcard /storage/sdcard0
on init
# Set permissions for persist partition
@@ -45,7 +35,6 @@
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
@@ -129,8 +118,6 @@
# 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
@@ -414,10 +401,6 @@
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
-
service thermald /system/bin/thermald
class main
group radio
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f125a0e..0281a1d 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -275,4 +275,13 @@
<item>hspa:4094,87380,704512,4096,16384,262144</item>
<item>lte:524288,1048576,2560000,262144,524288,1048576</item>
</string-array>
+
+ <!-- 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>
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 41f269c..a234b1d 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/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 -->
diff --git a/overlay/packages/CarrierConfig/res/xml/vendor.xml b/overlay/packages/CarrierConfig/res/xml/vendor.xml
new file mode 100644
index 0000000..cfdd923
--- /dev/null
+++ b/overlay/packages/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>
diff --git a/overlay/packages/apps/Nfc/res/values/provisioning.xml b/overlay/packages/apps/Nfc/res/values/provisioning.xml
deleted file mode 100644
index c996eb5..0000000
--- a/overlay/packages/apps/Nfc/res/values/provisioning.xml
+++ /dev/null
@@ -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>
