Merge "A11yMenuService unregisters displayListener" into main (c1ef3ca9) · Commits · e / os / android_frameworks_base

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

+21 −16

Original line number	Diff line number	Diff line
		@@ -94,7 +94,8 @@ public class AccessibilityMenuService extends AccessibilityService
		int mRotation;

		@Override
		public void onDisplayAdded(int displayId) {}
		public void onDisplayAdded(int displayId) {
		}

		@Override
		public void onDisplayRemoved(int displayId) {
		@@ -103,6 +104,9 @@ public class AccessibilityMenuService extends AccessibilityService

		@Override
		public void onDisplayChanged(int displayId) {
		if (mA11yMenuLayout == null) {
		return;
		}
		Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
		if (mRotation != display.getRotation()) {
		mRotation = display.getRotation();
		@@ -373,6 +377,7 @@ public class AccessibilityMenuService extends AccessibilityService
		public boolean onUnbind(Intent intent) {
		unregisterReceiver(mHideMenuReceiver);
		unregisterReceiver(mToggleMenuReceiver);
		mDisplayManager.unregisterDisplayListener(mDisplayListener);
		mPrefs.unregisterOnSharedPreferenceChangeListener(mSharedPreferenceChangeListener);
		sInitialized = false;
		if (mA11yMenuLayout != null) {