Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 am: 6cb4bb76d6 am: aa95c6d0b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307

Change-Id: Ibf2aa192a02fdb8fa9d52ad50ee7aca54c4b6461

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 6ed7210c0a47..23787ebffefb 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -184,6 +184,7 @@ import com.android.org.conscrypt.OpenSSLSocketImpl;
 import com.android.org.conscrypt.TrustedCertificateStore;
 import com.android.server.am.MemInfoDumpProto;
 
+import dalvik.system.AppSpecializationHooks;
 import dalvik.system.CloseGuard;
 import dalvik.system.VMDebug;
 import dalvik.system.VMRuntime;
@@ -6387,6 +6388,9 @@ public final class ActivityThread extends ClientTransactionHandler {
         Process.setStartTimes(SystemClock.elapsedRealtime(), SystemClock.uptimeMillis());
 
         AppCompatCallbacks.install(data.disabledCompatChanges);
+        // Let libcore handle any compat changes after installing the list of compat changes.
+        AppSpecializationHooks.handleCompatChangesBeforeBindingApplication();
+
         mBoundApplication = data;
         mConfiguration = new Configuration(data.config);
         mCompatConfiguration = new Configuration(data.config);