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

Commit 5ed888c9 authored by Bryce Lee's avatar Bryce Lee
Browse files

Capture IllegalArgumentException when unregistering dock receiver. 

RotationButtonController uses a broadcast receiver to track the current
dock state. The controller is used in multiple spots, including
Launcher. The usage paths in Launcher are open to a race condition where
multiple threads might unregister the receiver, side stepping measures
to pair unregister with register.

This changelist catches the exception, which is consistent with other
broadcast receiver unregistration in Launcher.

Test: manual
Fixes: 275476588
Change-Id: I809dc66ae20675312c538498bbade0c0c8f4b828
parent 22aca7d7

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(