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

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

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

Change-Id: I3760952679a5026acc685be97c759a6e1dc68810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2023-03-14 20:26:39 +00:00
committed by Automerger Merge Worker
parent 9236bc1366 0605e404dd
commit 4d579c6aa0
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/service/dreams/DreamService.java
View File

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