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 am: df551dda12 am: 1ef9359662

Browse Source 
am: 54423e2947

* commit '54423e2947a8e0219aeb7cabb4c03111b56745b5':
  Remove optimization to report config change

Change-Id: I51cc7d3ce50bac4c46d12eefc74cfba798a14acc
This commit is contained in:
Jorim Jaggi
2016-04-28 20:38:32 +00:00
committed by android-build-merger
parent 98c4b7dd48 54423e2947
commit 3c45bc6fde
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4617,16 +4617,7 @@ public final class ActivityThread {
// onConfigurationChanged
int diff = activity.mCurrentConfig.diff(newConfig);
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;
}
}