summaryrefslogtreecommitdiffstats
path: root/services/java
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 /services/java
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 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java6
1 files changed, 0 insertions, 6 deletions
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 @@ 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());