summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android/keyguard
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-09-03 15:39:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-03 15:39:11 +0000
commit053ff3c776d51dd216f3b87b692336570439033b (patch)
tree86955e2d0c6ad2292005251f143a460d2180f9f4 /packages/Keyguard/src/com/android/keyguard
parent95f3bcdce0b026369d924982dd3315da8dffaf3a (diff)
parentbe47b07bef0596dd9bf7137ea08cc1112328c6e8 (diff)
downloadframeworks_base-053ff3c776d51dd216f3b87b692336570439033b.zip
frameworks_base-053ff3c776d51dd216f3b87b692336570439033b.tar.gz
frameworks_base-053ff3c776d51dd216f3b87b692336570439033b.tar.bz2
Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 2da3b27..1c6dc2c 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -648,7 +648,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
@Override
public void onUserSwitchComplete(int newUserId) throws RemoteException {
mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCH_COMPLETE,
- newUserId));
+ newUserId, 0));
mSwitchingUser = false;
}
});