From 7337afdd7ec596b653e39ca12c5ac007ff260747 Mon Sep 17 00:00:00 2001 From: Will Leshner Date: Mon, 13 Mar 2023 15:41:37 -0700 Subject: [PATCH] Fix a SecurityExcption when trying to start low-light dream. A SecurityException can occur when attempting to start a dream with a power button press when in low-light conditions. This can happen because both a "regular" dream and the low-light dream are started at the same time. Test: manually by docking, covering the light sensor, and pushing the power button to start dreaming. Low-light should start without any crashes. Bug: 269947573 Change-Id: Ie1fbb9fce9f34be6b86bc4738f64c871bed99e2e --- core/java/android/service/dreams/DreamService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index 224307297e765..356a566fa9132 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -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();