From 2bce8f9a06b3a6762f66a376125f34151595998a Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Fri, 30 Oct 2020 12:17:25 +0000
Subject: [PATCH] Remove android.icu.impl.ICUBinary.dataPath for apps targeting
 S+

Bug: 139480281
Bug: 171979766
Test: ZygoteHooksTest
Change-Id: Ic25e240fbcedc08f9de799c025841e88f521d0bf
---
 core/java/android/app/ActivityThread.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 7afe8b79f0214..ef44d068862c0 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;
@@ -6384,6 +6385,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);