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

Commit 5c6eb790 authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Catch error thrown by WindowManager if window has already been... 

Merge "Catch error thrown by WindowManager if window has already been detached" into tm-qpr-dev am: a79ea05f am: 87ee883a

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



Change-Id: I88ab1fd570df68a0747ad844864a71f47dc5b7c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ef72b53 87ee883a

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java

+6 −1
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 
     * Inserts {@link Window} to host the dream overlay into the dream's parent window. Must be

     * called from the main executing thread. The window attributes closely mirror those that are

     * set by the {@link android.service.dreams.DreamService} on the dream Window.

     *

     * @param layoutParams The {@link android.view.WindowManager.LayoutParams} which allow inserting

     *                     into the dream window.

     */
@@ -302,7 +303,11 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ 


    private void resetCurrentDreamOverlayLocked() {

        if (mStarted && mWindow != null) {

            try {

                mWindowManager.removeView(mWindow.getDecorView());

            } catch (IllegalArgumentException e) {

                Log.e(TAG, "Error removing decor view when resetting overlay", e);

            }

        }



        mStateController.setOverlayActive(false);