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

am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev

Browse Source 
* commit 'a87826c345dbd692a86a340691cf7471a2505809':
  Fix face unlock for multiple users
This commit is contained in:
Amith Yamasani
2012-09-14 14:13:58 -07:00
committed by Android Git Automerger
parent 7b1be53754 a87826c345
commit 3e4ef8e220
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -20,6 +20,7 @@ import com.android.internal.R;
import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.ITelephony;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import android.app.ActivityManagerNative;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -225,7 +226,11 @@ public class LockPatternUtils {
public int getCurrentUser() { public int getCurrentUser() {
if (Process.myUid() == Process.SYSTEM_UID) { if (Process.myUid() == Process.SYSTEM_UID) {
return mCurrentUserId; try {
return ActivityManagerNative.getDefault().getCurrentUser().id;
} catch (RemoteException re) {
return mCurrentUserId;
}
} else { } else {
throw new SecurityException("Only the system process can get the current user"); throw new SecurityException("Only the system process can get the current user");
} }

3
policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java
View File

@@ -153,7 +153,8 @@ public class FaceUnlock implements BiometricSensorUnlock, Handler.Callback {
// This must show before bind to guarantee that Face Unlock has a place to display // This must show before bind to guarantee that Face Unlock has a place to display
show(SERVICE_STARTUP_VIEW_TIMEOUT); show(SERVICE_STARTUP_VIEW_TIMEOUT);
if (!mBoundToService) { if (!mBoundToService) {
Log.d(TAG, "Binding to Face Unlock service"); Log.d(TAG, "Binding to Face Unlock service for user="
+ mLockPatternUtils.getCurrentUser());
mContext.bindService(new Intent(IFaceLockInterface.class.getName()), mContext.bindService(new Intent(IFaceLockInterface.class.getName()),
mConnection, mConnection,
Context.BIND_AUTO_CREATE, Context.BIND_AUTO_CREATE,