Merge "Ignore failure when un/registering listener for invalid display" into rvc-dev am: 136c142894 am: 924c666c2b am: 812b24b9f3

Change-Id: Ieb2811e1283377a52c118fbdd0cea1281554ddc6
This commit is contained in:
TreeHugger Robot
2020-04-15 01:26:18 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}