summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-08-11 10:26:08 -0400
committerAlan Viverette <alanv@google.com>2015-08-11 10:26:08 -0400
commitc12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6 (patch)
tree675a4890776210fa59308c912377c629a389433b /core
parent1fbc1b3b4b742cdba25d32d65a9813933a37005f (diff)
downloadframeworks_base-c12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6.zip
frameworks_base-c12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6.tar.gz
frameworks_base-c12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6.tar.bz2
Avoid use-after-free race condition when rebasing theme
... by never rebasing the theme. We don't need to do this unless the system theme is configuration-dependent, which it is not currently. Bug: 22943781 Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/ActivityThread.java5
1 files changed, 0 insertions, 5 deletions
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 @@ 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);