diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/LockTaskController.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/LockTaskController.java b/services/core/java/com/android/server/wm/LockTaskController.java index f11c2a7da840..dcb7fe3fbc8b 100644 --- a/services/core/java/com/android/server/wm/LockTaskController.java +++ b/services/core/java/com/android/server/wm/LockTaskController.java @@ -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; |