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

Commit b1470279 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Adding a check to avoid trying to unregister if A11y Menu didn't... 

Merge "Adding a check to avoid trying to unregister if A11y Menu didn't successfully register" into main
parents 5daec645 56748a7c

packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java

+7 −5
Original line number Diff line number Diff line
@@ -375,11 +375,13 @@ public class AccessibilityMenuService extends AccessibilityService 


    @Override

    public boolean onUnbind(Intent intent) {

        if (sInitialized) {

            unregisterReceiver(mHideMenuReceiver);

            unregisterReceiver(mToggleMenuReceiver);

            mDisplayManager.unregisterDisplayListener(mDisplayListener);

            mPrefs.unregisterOnSharedPreferenceChangeListener(mSharedPreferenceChangeListener);

            sInitialized = false;

        }

        if (mA11yMenuLayout != null) {

            mA11yMenuLayout.clearLayout();

            mA11yMenuLayout = null;