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

Merge "Fix LockTaskModeTests failure" into tm-qpr-dev

Browse Source
This commit is contained in:
Louis Chang
2022-11-02 13:28:46 +00:00
committed by Android (Google) Code Review
parent c164c02c94 17370581a9
commit 847d0f53e7
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wm/LockTaskController.java
View File

@@ -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;