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

Commit f4b783f8 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Exit the keyguard when the user clicks a notification."

parents 8dbdee5b 92d33188

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.ObjectAnimator; 
import android.app.ActivityManager;

import android.app.ActivityManagerNative;

import android.app.Dialog;

import android.app.KeyguardManager;

import android.app.Notification;

import android.app.PendingIntent;

import android.app.StatusBarManager;
@@ -1640,6 +1641,10 @@ public class PhoneStatusBar extends StatusBar { 
                    // the stack trace isn't very helpful here.  Just log the exception message.

                    Slog.w(TAG, "Sending contentIntent failed: " + e);

                }



                KeyguardManager kgm =

                    (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

                if (kgm != null) kgm.exitKeyguardSecurely(null);

            }



            try {

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.animation.LayoutTransition; 
import android.animation.ObjectAnimator;

import android.app.ActivityManagerNative;

import android.app.Dialog;

import android.app.KeyguardManager;

import android.app.PendingIntent;

import android.app.Notification;

import android.app.StatusBarManager;
@@ -1318,10 +1319,15 @@ public class TabletStatusBar extends StatusBar implements 
                        new Rect(pos[0], pos[1], pos[0]+v.getWidth(), pos[1]+v.getHeight()));

                try {

                    mIntent.send(mContext, 0, overlay);



                } catch (PendingIntent.CanceledException e) {

                    // the stack trace isn't very helpful here.  Just log the exception message.

                    Slog.w(TAG, "Sending contentIntent failed: " + e);

                }



                KeyguardManager kgm =

                    (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

                if (kgm != null) kgm.exitKeyguardSecurely(null);

            }



            try {