From 9f7cd10134c881363bd1b891c6298f8f900ed46d Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 23 Apr 2015 14:50:34 +0100
Subject: [PATCH] Load ICU4J data on boot

Bug: 20252074
Bug: 20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
---
 preloaded-classes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/preloaded-classes b/preloaded-classes
index 151766f6e249b..7a41bb268d803 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