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

Merge "Remove optimization to report config change" into nyc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-04-28 20:28:36 +00:00
committed by Android (Google) Code Review
parent 76d985f1df 1793d4769b
commit df551dda12
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4617,18 +4617,9 @@ public final class ActivityThread {
// onConfigurationChanged // onConfigurationChanged
int diff = activity.mCurrentConfig.diff(newConfig); int diff = activity.mCurrentConfig.diff(newConfig);
if (diff != 0) { if (diff != 0) {
// If this activity doesn't handle any of the config changes then don't bother
// calling onConfigurationChanged as we're going to destroy it.
// Except in the case where the configuration changed on the activity manager side,
// but wasn't big enough to cause a resource change so the activity wasn't destroyed.
// In this case we still want to change the configuration of the activity but not
// report it to the app.
if ((~activity.mActivityInfo.getRealConfigChanged() & diff) == 0
|| !reportToActivity) {
shouldChangeConfig = true; shouldChangeConfig = true;
} }
} }
}
if (DEBUG_CONFIGURATION) { if (DEBUG_CONFIGURATION) {
Slog.v(TAG, "Config callback " + cb + ": shouldChangeConfig=" + shouldChangeConfig); Slog.v(TAG, "Config callback " + cb + ": shouldChangeConfig=" + shouldChangeConfig);