Merge "Fix LockTaskModeTests failure" into tm-qpr-dev (847d0f53) · Commits · e / os / android_frameworks_base

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;