Skip to content

Commit 7ffaa98

Browse files
committed
Clear ident in dismissKeyguardOnNextActivity().
BaseStatusBar uses this to launch activities over the insecure lockscreen, so clear identity. Bug: 6414983 Change-Id: Idf578923285ee1344e6e13e7f51e17a5f2005c75
1 parent 1e945c4 commit 7ffaa98

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

services/java/com/android/server/am/ActivityManagerService.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,12 +4107,17 @@ public void showBootMessage(final CharSequence msg, final boolean always) {
41074107

41084108
public void dismissKeyguardOnNextActivity() {
41094109
enforceNotIsolatedCaller("dismissKeyguardOnNextActivity");
4110-
synchronized (this) {
4111-
if (mLockScreenShown) {
4112-
mLockScreenShown = false;
4113-
comeOutOfSleepIfNeededLocked();
4110+
final long token = Binder.clearCallingIdentity();
4111+
try {
4112+
synchronized (this) {
4113+
if (mLockScreenShown) {
4114+
mLockScreenShown = false;
4115+
comeOutOfSleepIfNeededLocked();
4116+
}
4117+
mMainStack.dismissKeyguardOnNextActivityLocked();
41144118
}
4115-
mMainStack.dismissKeyguardOnNextActivityLocked();
4119+
} finally {
4120+
Binder.restoreCallingIdentity(token);
41164121
}
41174122
}
41184123

0 commit comments

Comments
 (0)