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

Merge "Attempt to fix problem where keyguard isn\'t locking" into nyc-dev

Browse Source 
am: 6593c28c31

* commit '6593c28c3110daa8cc2f2816ce9640a6848088db':
  Attempt to fix problem where keyguard isn't locking
This commit is contained in:
Jim Miller
2016-03-15 01:30:21 +00:00
committed by android-build-merger
parent 8c0512e5db 6593c28c31
commit 7d3e6f9b61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -811,7 +811,7 @@ public class KeyguardViewMediator extends SystemUI {
intent.putExtra("seq", mDelayedShowingSequence); intent.putExtra("seq", mDelayedShowingSequence);
PendingIntent sender = PendingIntent.getBroadcast(mContext, PendingIntent sender = PendingIntent.getBroadcast(mContext,
0, intent, PendingIntent.FLAG_CANCEL_CURRENT); 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, when, sender); mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, when, sender);
if (DEBUG) Log.d(TAG, "setting alarm to turn off keyguard, seq = " if (DEBUG) Log.d(TAG, "setting alarm to turn off keyguard, seq = "
+ mDelayedShowingSequence); + mDelayedShowingSequence);
doKeyguardLaterForChildProfilesLocked(); doKeyguardLaterForChildProfilesLocked();
@@ -828,7 +828,8 @@ public class KeyguardViewMediator extends SystemUI {
lockIntent.putExtra(Intent.EXTRA_USER_ID, info.id); lockIntent.putExtra(Intent.EXTRA_USER_ID, info.id);
PendingIntent lockSender = PendingIntent.getBroadcast( PendingIntent lockSender = PendingIntent.getBroadcast(
mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT); mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT);
mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, userWhen, lockSender); mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP,
userWhen, lockSender);
} }
} }
} }