Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22befec4 authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Capture IllegalArgumentException when unregistering dock receiver."... 

Merge "Capture IllegalArgumentException when unregistering dock receiver." into tm-qpr-dev am: 67c703c9 am: 97277bf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22382234



Change-Id: Ie526026bf2dc4e7538ddc910531afdb0d7a73ee6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bc8bd00 97277bf1

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

+6 −2
Original line number Diff line number Diff line
@@ -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;



        try {

            mContext.unregisterReceiver(mDockedReceiver);

        } catch (IllegalArgumentException e) {

            Log.e(TAG, "Docked receiver already unregistered", e);

        }



        if (mRotationWatcherRegistered) {

            try {

                WindowManagerGlobal.getWindowManagerService().removeRotationWatcher(