commit b4eb06402fba62f94bb16cbe433fe99a8df7cb18
author Alan Viverette <alanv@google.com> Tue Aug 11 18:24:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 11 18:24:04 2015 +0000
tree d60f93ca3837a7bfdb54316f542c501eb56d2268
parent ad7719dea4e8fd34854e4dcc918fc593c4416d82
parent c12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6

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

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index fd88a05..da21eaf 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4235,11 +4235,6 @@
 
             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

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 014527b..eb02199 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1024,12 +1024,6 @@
         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());