Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch error thrown by WindowManager if window has already been detached" into tm-qpr-dev

Browse Source
This commit is contained in:
Lucas Silva
2022-12-22 18:37:13 +00:00
committed by Android (Google) Code Review
parent 9af26b35ea 1d5e29abd5
commit a79ea05f59
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
View File

@@ -230,6 +230,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 * 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 * 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. * set by the {@link android.service.dreams.DreamService} on the dream Window.
*
* @param layoutParams The {@link android.view.WindowManager.LayoutParams} which allow inserting * @param layoutParams The {@link android.view.WindowManager.LayoutParams} which allow inserting
* into the dream window. * into the dream window.
*/ */
@@ -276,7 +277,11 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ
private void resetCurrentDreamOverlayLocked() { private void resetCurrentDreamOverlayLocked() {
if (mStarted && mWindow != null) { if (mStarted && mWindow != null) {
mWindowManager.removeView(mWindow.getDecorView()); try {
mWindowManager.removeView(mWindow.getDecorView());
} catch (IllegalArgumentException e) {
Log.e(TAG, "Error removing decor view when resetting overlay", e);
}
} }
mStateController.setOverlayActive(false); mStateController.setOverlayActive(false);