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

Commit 17370581 authored by Louis Chang's avatar Louis Chang
Browse files

Fix LockTaskModeTests failure 

NPE throw while running LockTaskModeTests because there is
no status bar on some devices, like Android Wear.

Bug: 254265883
Test: LockTaskModeTests
Change-Id: I5a3b104da19d60b2bf5c52c0c1a16c8625e5b279
parent b0d01823

services/core/java/com/android/server/wm/LockTaskController.java

+12 −3
Original line number Diff line number Diff line
@@ -604,7 +604,10 @@ public class LockTaskController { 
                getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId);

            }

            if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {

                getStatusBarService().showPinningEnterExitToast(false /* entering */);

                final IStatusBarService statusBarService = getStatusBarService();

                if (statusBarService != null) {

                    statusBarService.showPinningEnterExitToast(false /* entering */);

                }

            }

            mWindowManager.onLockTaskStateChanged(mLockTaskModeState);

        } catch (RemoteException ex) {
@@ -619,7 +622,10 @@ public class LockTaskController { 
    void showLockTaskToast() {

        if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) {

            try {

                getStatusBarService().showPinningEscapeToast();

                final IStatusBarService statusBarService = getStatusBarService();

                if (statusBarService != null) {

                    statusBarService.showPinningEscapeToast();

                }

            } catch (RemoteException e) {

                Slog.e(TAG, "Failed to send pinning escape toast", e);

            }
@@ -727,7 +733,10 @@ public class LockTaskController { 
        // When lock task starts, we disable the status bars.

        try {

            if (lockTaskModeState == LOCK_TASK_MODE_PINNED) {

                getStatusBarService().showPinningEnterExitToast(true /* entering */);

                final IStatusBarService statusBarService = getStatusBarService();

                if (statusBarService != null) {

                    statusBarService.showPinningEnterExitToast(true /* entering */);

                }

            }

            mWindowManager.onLockTaskStateChanged(lockTaskModeState);

            mLockTaskModeState = lockTaskModeState;