diff options
| author | Alan Viverette <alanv@google.com> | 2015-08-11 18:31:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 18:31:48 +0000 |
| commit | e720297fd89d39325a34f0d8f54e55971aec7269 (patch) | |
| tree | bc41a9c7c6a6ab38af04e7866e3c965cce12cbef /services/java | |
| parent | 5bba07eb01d923beea173712295d6b10c9762400 (diff) | |
| parent | b4eb06402fba62f94bb16cbe433fe99a8df7cb18 (diff) | |
| download | frameworks_base-e720297fd89d39325a34f0d8f54e55971aec7269.zip frameworks_base-e720297fd89d39325a34f0d8f54e55971aec7269.tar.gz frameworks_base-e720297fd89d39325a34f0d8f54e55971aec7269.tar.bz2 | |
am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit 'b4eb06402fba62f94bb16cbe433fe99a8df7cb18':
Avoid use-after-free race condition when rebasing theme
Diffstat (limited to 'services/java')
| -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 f1fac9e..760c2dc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1029,12 +1029,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()); |