Merge "Fix a SecurityExcption when trying to start low-light dream." into tm-qpr-dev am: 0605e404dd am: 4d579c6aa0

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

Change-Id: I96e6e9daa62e8f282b4e7704d3cf55571edd5166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2023-03-14 21:30:09 +00:00
committed by Automerger Merge Worker

View File

@@ -1362,6 +1362,11 @@ public class DreamService extends Service implements Window.Callback {
if (!ActivityTaskManager.getService().startDreamActivity(i)) {
detach();
}
} catch (SecurityException e) {
Log.w(mTag,
"Received SecurityException trying to start DreamActivity. "
+ "Aborting dream start.");
detach();
} catch (RemoteException e) {
Log.w(mTag, "Could not connect to activity task manager to start dream activity");
e.rethrowFromSystemServer();