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

Commit 4473f020 authored by Sandeep Siddhartha's avatar Sandeep Siddhartha
Browse files

Use the permission for hotword recognition 

- Also fixes an issue with PendingIntents being launched from the
  lockscreen taking a lot of time

Change-Id: I91b44328ba68b225454322b90a5b19a0d4c9a772
parent 498a5f54

packages/Keyguard/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
    <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />

    <uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />

    <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />

    <!-- Permission to perform hotword recognition -->

    <uses-permission android:name="android.permission.HOTWORD_RECOGNITION" />



    <application android:label="@string/app_name"

        android:process="com.android.systemui"

packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java

+6 −13
Original line number Diff line number Diff line
@@ -1784,30 +1784,23 @@ public class KeyguardHostView extends KeyguardViewBase { 
            }

        }



        public void onHotwordRecognized(final PendingIntent intent) {

        public void onHotwordRecognized(final Intent intent) {

            if (DEBUG) Log.d(TAG, "onHotwordRecognized");

            maybeStopHotwordDetector();

            // See if an activity can handle this intent.

            if (getContext().getPackageManager().resolveActivity(intent, 0) == null)

                return;

            if (SecurityMode.None == mCurrentSecuritySelection) {

                if (intent != null) {

                    try {

                        intent.send();

                    } catch (PendingIntent.CanceledException e) {

                        Log.w(TAG, "Failed to launch PendingIntent. Encountered CanceledException");

                    }

                    mActivityLauncher.launchActivity(intent, true, true, null, null);

                }

                mCallback.userActivity(0);

                mCallback.dismiss(false);

            } else if (ENABLE_HOTWORD_SECURE && mLockPatternUtils.isSecure()) {

                setOnDismissAction(new OnDismissAction() {

                    @Override

                    public boolean onDismiss() {

                        if (intent != null) {

                            try {

                                intent.send();

                            } catch (PendingIntent.CanceledException e) {

                                Log.w(TAG, "Failed to launch PendingIntent."

                                        + "Encountered CanceledException");

                            }

                            mActivityLauncher.launchActivity(intent, true, true, null, null);

                        }

                        return false;

                    }