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

Commit a7c9bec4 authored by Winson Chung's avatar Winson Chung
Browse files

Fixing a couple nav bar crashes 

- Reset the rotation button controller callback when detaching the nav
  bar (the callback can otherwise be called back)
- Only touch autohide if the controller is set (RotationButtonController
  update callback is set when initialized and not unset, so it too can
  callback into the nav bar view after it's been destroyed)
- Add workaround for issue where content provider can still callback
  the observer after the observer has been unregistered, but the msg
  has been posted to the handler (filed b/198002034 to track fw fix)

Bug: 194631201
Bug: 183051107
Bug: 197946101
Test: atest SystemUITests
Change-Id: I520ca261b012d1d7f04ea8f732819e7eb1b4f77f
parent ef3d2277

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+10 −1
Original line number Diff line number Diff line
@@ -422,6 +422,12 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
            new Handler(Looper.getMainLooper())) {

        @Override

        public void onChange(boolean selfChange, Uri uri) {

            // TODO(b/198002034): Content observers currently can still be called back after being

            // unregistered, and in this case we can ignore the change if the nav bar has been

            // destroyed already

            if (mNavigationBarView == null) {

                return;

            }

            updateAssistantEntrypoints();

        }

    };
@@ -648,7 +654,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        if (mIsOnDefaultDisplay) {

            final RotationButtonController rotationButtonController =

                    mNavigationBarView.getRotationButtonController();

            rotationButtonController.addRotationCallback(mRotationWatcher);

            rotationButtonController.setRotationCallback(mRotationWatcher);



            // Reset user rotation pref to match that of the WindowManager if starting in locked

            // mode. This will automatically happen when switching from auto-rotate to locked mode.
@@ -687,6 +693,9 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 


    @Override

    public void onViewDetachedFromWindow(View v) {

        final RotationButtonController rotationButtonController =

                mNavigationBarView.getRotationButtonController();

        rotationButtonController.setRotationCallback(null);

        mNavigationBarView.getBarTransitions().destroy();

        mNavigationBarView.getLightTransitionsController().destroy(mContext);

        mOverviewProxyService.removeCallback(mOverviewProxyListener);

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ public class NavigationBarView extends FrameLayout implements 
            new RotationButtonUpdatesCallback() {

                @Override

                public void onVisibilityChanged(boolean visible) {

                    if (visible) {

                    if (visible && mAutoHideController != null) {

                        // If the button will actually become visible and the navbar is about

                        // to hide, tell the statusbar to keep it around for longer

                        mAutoHideController.touchAutoHide();

packages/SystemUI/src/com/android/systemui/navigationbar/RotationButtonController.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class RotationButtonController { 
        TaskStackChangeListeners.getInstance().unregisterTaskStackListener(mTaskStackListener);

    }



    void addRotationCallback(Consumer<Integer> watcher) {

    void setRotationCallback(Consumer<Integer> watcher) {

        mRotWatcherListener = watcher;

    }