Merge "Add try-catch for the augmented autofill UI to avoid crashing" into rvc-dev (c5c35fc3) · Commits · e / os / android_frameworks_base

core/java/android/service/autofill/augmented/FillWindow.java

+18 −8

Original line number	Diff line number	Diff line
		@@ -208,6 +208,7 @@ public final class FillWindow implements AutoCloseable {
		if (sDebug) Log.d(TAG, "handleShow()");
		synchronized (mLock) {
		if (mWm != null && mFillView != null) {
		try {
		p.flags \|= WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
		if (!mShowing) {
		mWm.addView(mFillView, p);
		@@ -215,6 +216,11 @@ public final class FillWindow implements AutoCloseable {
		} else {
		mWm.updateViewLayout(mFillView, p);
		}
		} catch (WindowManager.BadTokenException e) {
		if (sDebug) Log.d(TAG, "Filed with token " + p.token + " gone.");
		} catch (IllegalStateException e) {
		if (sDebug) Log.d(TAG, "Exception showing window.");
		}
		}
		}
		}
		@@ -223,8 +229,12 @@ public final class FillWindow implements AutoCloseable {
		if (sDebug) Log.d(TAG, "handleHide()");
		synchronized (mLock) {
		if (mWm != null && mFillView != null && mShowing) {
		try {
		mWm.removeView(mFillView);
		mShowing = false;
		} catch (IllegalStateException e) {
		if (sDebug) Log.d(TAG, "Exception hiding window.");
		}
		}
		}
		}