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

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

Merge "Request keyguard dismissal from suspend dialog" into rvc-dev am: 08e440ca 

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

Change-Id: Ia45272c3178a9ddc30f7229e64297370f9971dcf
parents 948e9ee4 08e440ca

core/java/com/android/internal/app/SuspendedAppActivity.java

+24 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.Manifest; 
import android.annotation.Nullable;

import android.app.AlertDialog;

import android.app.AppGlobals;

import android.app.KeyguardManager;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.IntentSender;
@@ -208,9 +209,32 @@ public class SuspendedAppActivity extends AlertActivity 
        ap.mPositiveButtonText = getString(android.R.string.ok);

        ap.mNeutralButtonText = resolveNeutralButtonText();

        ap.mPositiveButtonListener = ap.mNeutralButtonListener = this;



        requestDismissKeyguardIfNeeded(ap.mMessage);



        setupAlert();

    }



    private void requestDismissKeyguardIfNeeded(CharSequence dismissMessage) {

        final KeyguardManager km = getSystemService(KeyguardManager.class);

        if (km.isKeyguardLocked()) {

            km.requestDismissKeyguard(this, dismissMessage,

                    new KeyguardManager.KeyguardDismissCallback() {

                        @Override

                        public void onDismissError() {

                            Slog.e(TAG, "Error while dismissing keyguard."

                                    + " Keeping the dialog visible.");

                        }



                        @Override

                        public void onDismissCancelled() {

                            Slog.w(TAG, "Keyguard dismiss was cancelled. Finishing.");

                            SuspendedAppActivity.this.finish();

                        }

                    });

        }

    }



    @Override

    public void onClick(DialogInterface dialog, int which) {

        switch (which) {