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

Commit dc0bdeed authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev 

am: fa7b3439

Change-Id: I971b67d5e73b3a45e629212e6a9161c74cff5c72
parents 4d384aa3 fa7b3439

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -2199,7 +2199,7 @@ public final class ActivityThread { 
    public ContextImpl getSystemUiContext() {

        synchronized (this) {

            if (mSystemUiContext == null) {

                mSystemUiContext = ContextImpl.createSystemUiContext(this);

                mSystemUiContext = ContextImpl.createSystemUiContext(getSystemContext());

            }

            return mSystemUiContext;

        }

core/java/android/app/ContextImpl.java

+5 −4
Original line number Diff line number Diff line
@@ -2220,11 +2220,12 @@ class ContextImpl extends Context { 


    /**

     * System Context to be used for UI. This Context has resources that can be themed.

     * Make sure that the created system UI context shares the same LoadedApk as the system context.

     */

    static ContextImpl createSystemUiContext(ActivityThread mainThread) {

        LoadedApk packageInfo = new LoadedApk(mainThread);

        ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, null, 0,

                null);

    static ContextImpl createSystemUiContext(ContextImpl systemContext) {

        final LoadedApk packageInfo = systemContext.mPackageInfo;

        ContextImpl context = new ContextImpl(null, systemContext.mMainThread, packageInfo, null,

                null, null, 0, null);

        context.setResources(createResources(null, packageInfo, null, Display.DEFAULT_DISPLAY, null,

                packageInfo.getCompatibilityInfo()));

        return context;