summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-04-24 11:01:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-24 11:01:29 +0000
commita921fa0fc354fed48d29822109c573a124a95dfd (patch)
tree9336ec84526a4286570aec2ede3412e09967ac0b
parentd25f1f7877c8311dfdcbb6deb1c21b06f15f8914 (diff)
parentff1e7e01f16173ae0ea1bd9e6738ff7b5ce33add (diff)
downloadframeworks_base-a921fa0fc354fed48d29822109c573a124a95dfd.zip
frameworks_base-a921fa0fc354fed48d29822109c573a124a95dfd.tar.gz
frameworks_base-a921fa0fc354fed48d29822109c573a124a95dfd.tar.bz2
am ff1e7e01: am 0e29681f: Merge "Load ICU4J data on boot"
* commit 'ff1e7e01f16173ae0ea1bd9e6738ff7b5ce33add': Load ICU4J data on boot
-rw-r--r--preloaded-classes5
1 files changed, 5 insertions, 0 deletions
diff --git a/preloaded-classes b/preloaded-classes
index 151766f..7a41bb2 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -828,6 +828,11 @@ android.hardware.soundtrigger.SoundTriggerModule
android.hardware.usb.UsbDevice
android.hardware.usb.UsbDeviceConnection
android.hardware.usb.UsbRequest
+# Initializing android.icu.impl.ICUBinary loads the ICU data.
+# Opening the files in the Zygote avoids StrictMode violations.
+# It also ensures the ICU data files are mapped on boot and all
+# apps will be consistent (even if files are added to /data).
+android.icu.impl.ICUBinary
android.inputmethodservice.ExtractEditText
android.location.Location
android.location.Location$1