Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix SysUI NPE crash during the boot/init progress" into sc-dev am: 2adcf7686d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15052835

Change-Id: Iab832312eaa2af14c0c767163b2f1bc52871192c
This commit is contained in:
TreeHugger Robot
2021-06-22 07:40:36 +00:00
committed by Automerger Merge Worker
parent aa1f4e4f38 2adcf7686d
commit 1a6b2ae623
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,7 +482,9 @@ public class OneHandedController implements RemoteCallable<OneHandedController>
@VisibleForTesting @VisibleForTesting
void notifyExpandNotification() { void notifyExpandNotification() {
mMainExecutor.execute(() -> mEventCallback.notifyExpandNotification()); if (mEventCallback != null) {
mMainExecutor.execute(() -> mEventCallback.notifyExpandNotification());
}
} }
@VisibleForTesting @VisibleForTesting

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

@@ -435,4 +435,17 @@ public class OneHandedControllerTest extends OneHandedTestCase {
verify(mSpiedOneHandedController).notifyShortcutState(anyInt()); 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());
}
} }