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

Merge "Fix VR mode handling when the screen blanks and unblanks." into nyc-dev

Browse Source 
am: fc465bf

* commit 'fc465bf6bf456f5be1790b2ba60ea3da9c671d71':
  Fix VR mode handling when the screen blanks and unblanks.

Change-Id: I6f7f76da532e6e1f07ec12b213b6b880f3d29d6a
This commit is contained in:
Craig Donner
2016-04-15 18:35:05 +00:00
committed by android-build-merger
parent 740c433b59 fc465bf6bf
commit 1cdff8b536
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1471,6 +1471,7 @@ public final class ActivityManagerService extends ActivityManagerNative
static final int NOTIFY_PINNED_STACK_ANIMATION_ENDED_LISTENERS_MSG = 66;
static final int NOTIFY_FORCED_RESIZABLE_MSG = 67;
static final int NOTIFY_ACTIVITY_DISMISSING_DOCKED_STACK_MSG = 68;
static final int VR_MODE_APPLY_IF_NEEDED_MSG = 69;
static final int FIRST_ACTIVITY_STACK_MSG = 100;
static final int FIRST_BROADCAST_QUEUE_MSG = 200;
@@ -2241,6 +2242,17 @@ public final class ActivityManagerService extends ActivityManagerNative
}
vrService.setVrMode(vrMode, requestedPackage, userId, callingPackage);
} break;
case VR_MODE_APPLY_IF_NEEDED_MSG: {
final ActivityRecord r = (ActivityRecord) msg.obj;
final boolean needsVrMode = r != null && r.requestedVrComponent != null;
if (needsVrMode) {
VrManagerInternal vrService =
LocalServices.getService(VrManagerInternal.class);
boolean enable = msg.arg1 == 1;
vrService.setVrMode(enable, r.requestedVrComponent, r.userId,
r.info.getComponentName());
}
} break;
}
}
};
@@ -3021,6 +3033,11 @@ public final class ActivityManagerService extends ActivityManagerNative
mHandler.obtainMessage(VR_MODE_CHANGE_MSG, 0, 0, r));
}
private void applyVrModeIfNeededLocked(ActivityRecord r, boolean enable) {
mHandler.sendMessage(
mHandler.obtainMessage(VR_MODE_APPLY_IF_NEEDED_MSG, enable ? 1 : 0, 0, r));
}
final void showAskCompatModeDialogLocked(ActivityRecord r) {
Message msg = Message.obtain();
msg.what = SHOW_COMPAT_MODE_DIALOG_UI_MSG;
@@ -6537,6 +6554,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// Some stack visibility might change (e.g. docked stack)
mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
applyVrModeIfNeededLocked(mFocusedActivity, true);
}
}
} finally {
@@ -20925,6 +20943,7 @@ public final class ActivityManagerService extends ActivityManagerNative
SleepTokenImpl token = new SleepTokenImpl(tag);
mSleepTokens.add(token);
updateSleepIfNeededLocked();
applyVrModeIfNeededLocked(mFocusedActivity, false);
return token;
}
}