Merge "Fix a SecurityExcption when trying to start low-light dream." into tm-qpr-dev am: 0605e404dd
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:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user