Merge "Catch error thrown by WindowManager if window has already been detached" into tm-qpr-dev (a79ea05f) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -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
		* 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.
		*/
		@@ -276,7 +277,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);