diff options
| author | 2023-03-31 21:24:54 +0000 | |
|---|---|---|
| committer | 2023-03-31 21:24:54 +0000 | |
| commit | 97277bf1294d1fa490f66e18c8659e8856149f2a (patch) | |
| tree | 9bedd41667f20954f5dcb744254032d13601fce2 | |
| parent | 5514c37700d86142132d11b82d823460f2739293 (diff) | |
| parent | 67c703c94523062bbbb3ef6d883aeadc5b095c27 (diff) | |
Merge "Capture IllegalArgumentException when unregistering dock receiver." into tm-qpr-dev am: 67c703c945
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22382234
Change-Id: Ie7c54c8dc96cd4e9f7ce4318be8c38175d03e637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java index 53fab69bd3b8..cab54d08b3ec 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java @@ -66,7 +66,6 @@ import com.android.systemui.shared.system.TaskStackChangeListeners; import java.io.PrintWriter; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Supplier; /** @@ -244,7 +243,12 @@ public class RotationButtonController { mListenersRegistered = false; - mContext.unregisterReceiver(mDockedReceiver); + try { + mContext.unregisterReceiver(mDockedReceiver); + } catch (IllegalArgumentException e) { + Log.e(TAG, "Docked receiver already unregistered", e); + } + if (mRotationWatcherRegistered) { try { WindowManagerGlobal.getWindowManagerService().removeRotationWatcher( |