Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-08-11 18:24:04 +00:00
committed by Android (Google) Code Review
parent ad7719dea4 c12ec70def
commit b4eb06402f
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ActivityThread.java
View File

@@ -4235,11 +4235,6 @@ public final class ActivityThread {
configDiff = mConfiguration.updateFrom(config); configDiff = mConfiguration.updateFrom(config);
config = applyCompatConfiguration(mCurDefaultDisplayDpi); config = applyCompatConfiguration(mCurDefaultDisplayDpi);
final Theme systemTheme = getSystemContext().getTheme();
if ((systemTheme.getChangingConfigurations() & configDiff) != 0) {
systemTheme.rebase();
}
} }
ArrayList<ComponentCallbacks2> callbacks = collectComponentCallbacks(false, config); ArrayList<ComponentCallbacks2> callbacks = collectComponentCallbacks(false, config);

6
services/java/com/android/server/SystemServer.java
View File

@@ -1024,12 +1024,6 @@ public final class SystemServer {
w.getDefaultDisplay().getMetrics(metrics); w.getDefaultDisplay().getMetrics(metrics);
context.getResources().updateConfiguration(config, 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 { try {
// TODO: use boot phase // TODO: use boot phase
mPowerManagerService.systemReady(mActivityManagerService.getAppOpsService()); mPowerManagerService.systemReady(mActivityManagerService.getAppOpsService());