Merge "Ignore failure when un/registering listener for invalid display" into rvc-dev (136c1428) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ public class EdgeBackGestureHandler implements DisplayListener,
		WindowManagerGlobal.getWindowManagerService()
		.unregisterSystemGestureExclusionListener(
		mGestureExclusionListener, mDisplayId);
		} catch (RemoteException e) {
		} catch (RemoteException \| IllegalArgumentException e) {
		Log.e(TAG, "Failed to unregister window manager callbacks", e);
		}

		@@ -326,7 +326,7 @@ public class EdgeBackGestureHandler implements DisplayListener,
		WindowManagerGlobal.getWindowManagerService()
		.registerSystemGestureExclusionListener(
		mGestureExclusionListener, mDisplayId);
		} catch (RemoteException e) {
		} catch (RemoteException \| IllegalArgumentException e) {
		Log.e(TAG, "Failed to register window manager callbacks", e);
		}