Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4765436 authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

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

Merge "Remove android.icu.impl.ICUBinary.dataPath for apps targeting S+" am: ffcc7427 am: 6cb4bb76 am: aa95c6d0 am: 18b664c7

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

Change-Id: I3647a19ce7804865d21affd6a59948032cdd8225
parents a15ff93e 18b664c7

core/java/android/app/ActivityThread.java

+4 −0
Original line number Diff line number Diff line
@@ -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);