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

Commit f3f77d86 authored by Bill Lin's avatar Bill Lin Committed by android-build-team Robot
Browse files

Fix SysUI NPE crash during the boot/init progress 

When Device boot and SystemUI servies starting, settings provider
may callback onChange() when OneHandedController register observer.
If the callback timing earlier han mEventCallback registered by
WMShll#initOneHanded, then the NPE will happen.

The simple fix is to add NPE check in
OneHandedController#notifyExpandNotifcation()
we can just ignore the callback during init time since the singal
is to expand notification and come from shorcut after user enable
and tap shortcut.(No need to act for the signal during boot progress.)

Test: manual reboot device and observe
Test: atest WMShellUnitTests
Bug: 191600033
Change-Id: I73849afa9904031759da304298221dbb222aeaaa
(cherry picked from commit c4bdf37a)
parent e36bd6a4

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

+3 −1
Original line number Diff line number Diff line
@@ -482,8 +482,10 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 


    @VisibleForTesting

    void notifyExpandNotification() {

        if (mEventCallback != null) {

            mMainExecutor.execute(() -> mEventCallback.notifyExpandNotification());

        }

    }



    @VisibleForTesting

    void notifyUserConfigChanged(boolean success) {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java

+13 −0
Original line number Diff line number Diff line
@@ -435,4 +435,17 @@ public class OneHandedControllerTest extends OneHandedTestCase { 


        verify(mSpiedOneHandedController).notifyShortcutState(anyInt());

    }



    @Test

    public void testNotifyExpandNotification_withNullCheckProtection() {

        when(mSpiedOneHandedController.isOneHandedEnabled()).thenReturn(false);

        when(mSpiedTransitionState.getState()).thenReturn(STATE_NONE);

        when(mSpiedTransitionState.isTransitioning()).thenReturn(false);

        when(mSpiedOneHandedController.isSwipeToNotificationEnabled()).thenReturn(true);

        mSpiedOneHandedController.setOneHandedEnabled(true);

        mSpiedOneHandedController.notifyExpandNotification();



        // Verify no NPE crash and mMockShellMainExecutor never be execute.

        verify(mMockShellMainExecutor, never()).execute(any());

    }

}