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

Merge "Capture IllegalArgumentException when unregistering dock receiver." into tm-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2023-03-31 21:01:01 +00:00
committed by Android (Google) Code Review
parent 8e7c469bd1 5ed888c941
commit 67c703c945
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java
View File

@@ -66,7 +66,6 @@ import com.android.systemui.shared.system.TaskStackChangeListeners;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Optional; import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
@@ -244,7 +243,12 @@ public class RotationButtonController {
mListenersRegistered = false; mListenersRegistered = false;
mContext.unregisterReceiver(mDockedReceiver); try {
mContext.unregisterReceiver(mDockedReceiver);
} catch (IllegalArgumentException e) {
Log.e(TAG, "Docked receiver already unregistered", e);
}
if (mRotationWatcherRegistered) { if (mRotationWatcherRegistered) {
try { try {
WindowManagerGlobal.getWindowManagerService().removeRotationWatcher( WindowManagerGlobal.getWindowManagerService().removeRotationWatcher(