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

Commit 7d3e6f9b authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

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

am: 6593c28c

* commit '6593c28c':
  Attempt to fix problem where keyguard isn't locking
parents 8c0512e5 6593c28c

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −2
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ public class KeyguardViewMediator extends SystemUI { 
        intent.putExtra("seq", mDelayedShowingSequence);

        PendingIntent sender = PendingIntent.getBroadcast(mContext,

                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 = "

                         + mDelayedShowingSequence);

        doKeyguardLaterForChildProfilesLocked();
@@ -828,7 +828,8 @@ public class KeyguardViewMediator extends SystemUI { 
                lockIntent.putExtra(Intent.EXTRA_USER_ID, info.id);

                PendingIntent lockSender = PendingIntent.getBroadcast(

                        mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT);

                mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, userWhen, lockSender);

                mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                        userWhen, lockSender);

            }

        }

    }