From c12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 11 Aug 2015 10:26:08 -0400 Subject: 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 --- services/java/com/android/server/SystemServer.java | 6 ------ 1 file changed, 6 deletions(-) (limited to 'services') 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()); -- cgit v1.1