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

Author: Amith Yamasani

core/java/com/android/internal/widget/LockPatternUtils.java

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

policy/src/com/android/internal/policy/impl/keyguard/FaceUnlock.java

@@ -153,7 +153,8 @@ public boolean start() {
         // This must show before bind to guarantee that Face Unlock has a place to display
         show(SERVICE_STARTUP_VIEW_TIMEOUT);
         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()),
                     mConnection,
                     Context.BIND_AUTO_CREATE,