diff options
| author | Alan Viverette <alanv@google.com> | 2015-08-11 18:24:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-11 18:24:04 +0000 |
| commit | b4eb06402fba62f94bb16cbe433fe99a8df7cb18 (patch) | |
| tree | d60f93ca3837a7bfdb54316f542c501eb56d2268 /services | |
| parent | ad7719dea4e8fd34854e4dcc918fc593c4416d82 (diff) | |
| parent | c12ec70def2a5682c6cd7fdb3adaa82cc34d5bf6 (diff) | |
| download | frameworks_base-b4eb06402fba62f94bb16cbe433fe99a8df7cb18.zip frameworks_base-b4eb06402fba62f94bb16cbe433fe99a8df7cb18.tar.gz frameworks_base-b4eb06402fba62f94bb16cbe433fe99a8df7cb18.tar.bz2 | |
Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
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()); |