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

Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev am: a781d471e2

Browse Source 
am: ae56a90541

Change-Id: I88b6daeec2a6770ab31e0ab661448968597fcdf5
This commit is contained in:
Bryce Lee
2017-07-13 02:31:59 +00:00
committed by android-build-merger
parent f0d0b22316 ae56a90541
commit 6ee45928e3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityRecord.java
View File

@@ -2303,10 +2303,12 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
outBounds.setEmpty();
final float maxAspectRatio = info.maxAspectRatio;
final ActivityStack stack = getStack();
if (task == null || stack == null || !task.mFullscreen || maxAspectRatio == 0) {
if (task == null || stack == null || !task.mFullscreen || maxAspectRatio == 0
|| isInVrUiMode(getConfiguration())) {
// We don't set override configuration if that activity task isn't fullscreen. I.e. the
// activity is in multi-window mode. Or, there isn't a max aspect ratio specified for
// the activity. This is indicated by an empty {@link outBounds}.
// the activity. This is indicated by an empty {@link outBounds}. We also don't set it
// if we are in VR mode.
return;
}