diff options
| author | vichang <vichang@google.com> | 2020-11-06 12:45:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 12:45:32 +0000 |
| commit | d476543630aaa65c77bb0a6afddef96f009e2abc (patch) | |
| tree | e463184331e4de932a9c3c9e44e675331d053a67 /core/java/android | |
| parent | a15ff93eb5749941317ddaa7022f2088e04ec1fd (diff) | |
| parent | 18b664c70eeb0d92bddfb4a3e75c2f3e78bc7f18 (diff) | |
Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427a8 am: 6cb4bb76d6 am: aa95c6d0b9 am: 18b664c70e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481307
Change-Id: I3647a19ce7804865d21affd6a59948032cdd8225
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b68194792db1..b29209452ff5 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -186,6 +186,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; @@ -6309,6 +6310,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); |