Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: If52898da0b66bf70ed7533bc991251a1f927f19c
This commit is contained in:
vichang
2020-11-06 11:57:38 +00:00
committed by Automerger Merge Worker
parent d60841c6e4 6cb4bb76d6
commit aa95c6d0b9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -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);