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

Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 47797a7653" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-01 23:13:43 +00:00
committed by Android (Google) Code Review
parent 1267b551f1 ac63799c1d
commit 4f01d2390f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1582,6 +1582,11 @@ final class TaskRecord {
* @param globalConfig global configuration to update from. * @param globalConfig global configuration to update from.
*/ */
void sanitizeOverrideConfiguration(Configuration globalConfig) { void sanitizeOverrideConfiguration(Configuration globalConfig) {
// If it's fullscreen, the override config should be empty and we should leave it alone.
if (mFullscreen) {
return;
}
// screenLayout field is set in #calculateOverrideConfig but only part of it is really // screenLayout field is set in #calculateOverrideConfig but only part of it is really
// overridden - aspect ratio and size. Other flags (like layout direction) can be updated // overridden - aspect ratio and size. Other flags (like layout direction) can be updated
// separately in global config and they also must be updated in override config. // separately in global config and they also must be updated in override config.