diff options
| author | Alan Viverette <alanv@google.com> | 2015-08-11 18:53:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 18:53:13 +0000 |
| commit | 3e384531bed8f80867ce1bab9c8de315865be824 (patch) | |
| tree | 2e44a983db008634e26093216e388d457e4b4e67 /core/java/android | |
| parent | 5e3e4f9b5832c4ddf3a4ad1944622966351e6ffe (diff) | |
| parent | 1743988cd7647af8c64c961d4ca5e9d4b4b7bc00 (diff) | |
am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit '1743988cd7647af8c64c961d4ca5e9d4b4b7bc00':
Avoid use-after-free race condition when rebasing theme
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 83d41527650f..890b75493874 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4238,11 +4238,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); |