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

Merge "Ignore failure when un/registering listener for invalid display" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-15 00:53:26 +00:00
committed by Android (Google) Code Review
parent 3e188ae81d 939f5bd3e8
commit 136c142894
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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