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

Try to dismiss Keyguard bypassing bouncer only for active users

Browse Source 
Some bouncers might allow showing keyguards for users that are not
currently active (e.g. before any user is signed in, in which case the
system user is active). Make sure that keyguard is not dismissed
without showing bouncer in these cases.

Change-Id: I0e037b2d4e095d49c1f0d06a9fe1b9a6233421b0
(cherry picked from commit aa69fd417f)
This commit is contained in:
Toni Barzic
2016-02-04 15:14:49 -08:00
parent f0febdcf90
commit 657f88516a
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
View File

@@ -16,7 +16,10 @@
package com.android.systemui.statusbar.phone;
import android.app.ActivityManager;
import android.content.Context;
import android.os.UserHandle;
import android.util.Slog;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -42,6 +45,8 @@ import static com.android.keyguard.KeyguardSecurityModel.SecurityMode;
*/
public class KeyguardBouncer {
final static private String TAG = "KeyguardBouncer";
protected Context mContext;
protected ViewMediatorCallback mCallback;
protected LockPatternUtils mLockPatternUtils;
@@ -84,14 +89,25 @@ public class KeyguardBouncer {
return;
}
// Try to dismiss the Keyguard. If no security pattern is set, this will dismiss the whole
// Keyguard. If we need to authenticate, show the bouncer.
if (!mKeyguardView.dismiss()) {
mShowingSoon = true;
// Split up the work over multiple frames.
DejankUtils.postAfterTraversal(mShowRunnable);
final int activeUserId = ActivityManager.getCurrentUser();
final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser();
final boolean allowDismissKeyguard = activeUserId != UserHandle.USER_SYSTEM
&& activeUserId == keyguardUserId;
// If allowed, try to dismiss the Keyguard. If no security auth (password/pin/pattern) is
// set, this will dismiss the whole Keyguard. Otherwise, show the bouncer.
if (allowDismissKeyguard && mKeyguardView.dismiss()) {
return;
}
// This condition may indicate an error on Android, so log it.
if (!allowDismissKeyguard) {
Slog.w(TAG, "User can't dismiss keyguard: " + activeUserId + " != " + keyguardUserId);
}
mShowingSoon = true;
// Split up the work over multiple frames.
DejankUtils.postAfterTraversal(mShowRunnable);
}
private final Runnable mShowRunnable = new Runnable() {