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

Commit 5f4ea939 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make the KEYGUARD_DELAYED broadcast priority" into tm-dev am: 62649a71 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17804543



Change-Id: I959d2388d1817637f847ecdb1eb441fe4f0eaddf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58e50903 62649a71

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

+5 −1
Original line number Diff line number Diff line
@@ -1083,6 +1083,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
        final IntentFilter delayedActionFilter = new IntentFilter();

        delayedActionFilter.addAction(DELAYED_KEYGUARD_ACTION);

        delayedActionFilter.addAction(DELAYED_LOCK_PROFILE_ACTION);

        delayedActionFilter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter,

                SYSTEMUI_PERMISSION, null /* scheduler */,

                Context.RECEIVER_EXPORTED_UNAUDITED);
@@ -1392,6 +1393,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
        // Lock in the future

        long when = SystemClock.elapsedRealtime() + timeout;

        Intent intent = new Intent(DELAYED_KEYGUARD_ACTION);

        intent.setPackage(mContext.getPackageName());

        intent.putExtra("seq", mDelayedShowingSequence);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        PendingIntent sender = PendingIntent.getBroadcast(mContext,
@@ -1412,11 +1414,13 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                } else {

                    long userWhen = SystemClock.elapsedRealtime() + userTimeout;

                    Intent lockIntent = new Intent(DELAYED_LOCK_PROFILE_ACTION);

                    lockIntent.setPackage(mContext.getPackageName());

                    lockIntent.putExtra("seq", mDelayedProfileShowingSequence);

                    lockIntent.putExtra(Intent.EXTRA_USER_ID, profileId);

                    lockIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

                    PendingIntent lockSender = PendingIntent.getBroadcast(

                            mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);

                            mContext, 0, lockIntent,

                            PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);

                    mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                            userWhen, lockSender);

                }