Merge "Make USER_PRESENT broadcast per-user." into jb-mr1-dev

Author: jsharkey

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

@@ -39,6 +39,7 @@
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.EventLog;
@@ -1030,7 +1031,9 @@ private void handleKeyguardDone(boolean wakeup) {
             mPM.wakeUp(SystemClock.uptimeMillis());
         }
         mWakeLock.release();
-        mContext.sendBroadcast(mUserPresentIntent);
+
+        final UserHandle currentUser = new UserHandle(mLockPatternUtils.getCurrentUser());
+        mContext.sendBroadcastAsUser(mUserPresentIntent, currentUser);
     }
 
     /**