Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 478dedd2 authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I96e6e9daa62e8f282b4e7704d3cf55571edd5166
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f92f627 4d579c6a

core/java/android/service/dreams/DreamService.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -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();