Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e9aa741 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 11a03afa 6a25cbdd

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

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.os.PowerManager; 
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 @@ public class KeyguardViewMediator implements KeyguardViewCallback { 
            mPM.wakeUp(SystemClock.uptimeMillis());

        }

        mWakeLock.release();

        mContext.sendBroadcast(mUserPresentIntent);



        final UserHandle currentUser = new UserHandle(mLockPatternUtils.getCurrentUser());

        mContext.sendBroadcastAsUser(mUserPresentIntent, currentUser);

    }



    /**