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

Commit 3288e632 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 

* commit 'b4eb0640':
  Avoid use-after-free race condition when rebasing theme
parents f18a0cfe b4eb0640

core/java/android/app/ActivityThread.java

+0 −5
Original line number Diff line number Diff line
@@ -4238,11 +4238,6 @@ public final class ActivityThread { 


            configDiff = mConfiguration.updateFrom(config);

            config = applyCompatConfiguration(mCurDefaultDisplayDpi);



            final Theme systemTheme = getSystemContext().getTheme();

            if ((systemTheme.getChangingConfigurations() & configDiff) != 0) {

                systemTheme.rebase();

            }

        }



        ArrayList<ComponentCallbacks2> callbacks = collectComponentCallbacks(false, config);

services/java/com/android/server/SystemServer.java

+0 −6
Original line number Diff line number Diff line
@@ -1024,12 +1024,6 @@ public final class SystemServer { 
        w.getDefaultDisplay().getMetrics(metrics);

        context.getResources().updateConfiguration(config, metrics);



        // The system context's theme may be configuration-dependent.

        final Theme systemTheme = context.getTheme();

        if (systemTheme.getChangingConfigurations() != 0) {

            systemTheme.rebase();

        }



        try {

            // TODO: use boot phase

            mPowerManagerService.systemReady(mActivityManagerService.getAppOpsService());