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

Merge changes from topic "concurrent-keyguard" into udc-dev am: cc5495e933 am: fae000304d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23121840

Change-Id: I6a47d75b8047d3b768963cbd4cf60e64221bea78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kevin Chyn
2023-05-12 02:06:43 +00:00
committed by Automerger Merge Worker
parent efb626d4c7 fae000304d
commit c2922b0b05
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/WindowManager/Jetpack/src/androidx/window/extensions/area/WindowAreaComponentImpl.java
View File

@@ -342,11 +342,22 @@ public class WindowAreaComponentImpl implements WindowAreaComponent,
mRearDisplayPresentationController); mRearDisplayPresentationController);
DeviceStateRequest concurrentDisplayStateRequest = DeviceStateRequest.newBuilder( DeviceStateRequest concurrentDisplayStateRequest = DeviceStateRequest.newBuilder(
mConcurrentDisplayState).build(); mConcurrentDisplayState).build();
mDeviceStateManager.requestState(
concurrentDisplayStateRequest, try {
mExecutor, mDeviceStateManager.requestState(
deviceStateCallback concurrentDisplayStateRequest,
); mExecutor,
deviceStateCallback
);
} catch (SecurityException e) {
// If a SecurityException occurs when invoking DeviceStateManager#requestState
// (e.g. if the caller is not in the foreground, or if it does not have the required
// permissions), we should first clean up our local state before re-throwing the
// SecurityException to the caller. Otherwise, subsequent attempts to
// startRearDisplayPresentationSession will always fail.
mRearDisplayPresentationController = null;
throw e;
}
} }
} }