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 /core | |
| 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 'core')
| -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 fd88a05..da21eaf 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4235,11 +4235,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); |