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

2023-03-14 20:01:10 +00:00
parent 804a8e1146 7337afdd7e
commit 0605e404dd
1 changed files with 5 additions and 0 deletions
--- 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();