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

Commit f2c31a51 authored by Nicholas Ambur's avatar Nicholas Ambur
Browse files

Revert "change KeyphraseEnrollmentInfo to store services" 

This reverts commit 07ba2b7f.

This change is being reverted because it needs to be paired with an AGSA
prebuilt APK update.

Test: Confirm prebuilt AGSA apk does not crash on enrollment
Bug: 141155032
Change-Id: Ie504f125966d38a11c65ae96f39e9a5aa7ce43ed
parent eae6b540

core/java/android/hardware/soundtrigger/KeyphraseEnrollmentInfo.java

+7 −9
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ public class KeyphraseEnrollmentInfo { 
     */

    private static final String VOICE_KEYPHRASE_META_DATA = "android.voice_enrollment";

    /**

     * Intent Action: for managing the keyphrases for hotword detection.

     * This needs to be defined by a service that supports enrolling users for hotword/keyphrase

     * Activity Action: Show activity for managing the keyphrases for hotword detection.

     * This needs to be defined by an activity that supports enrolling users for hotword/keyphrase

     * detection.

     */

    public static final String ACTION_MANAGE_VOICE_KEYPHRASES =
@@ -101,7 +101,7 @@ public class KeyphraseEnrollmentInfo { 
        // Find the apps that supports enrollment for hotword keyhphrases,

        // Pick a privileged app and obtain the information about the supported keyphrases

        // from its metadata.

        List<ResolveInfo> ris = pm.queryIntentServices(

        List<ResolveInfo> ris = pm.queryIntentActivities(

                new Intent(ACTION_MANAGE_VOICE_KEYPHRASES), PackageManager.MATCH_DEFAULT_ONLY);

        if (ris == null || ris.isEmpty()) {

            // No application capable of enrolling for voice keyphrases is present.
@@ -116,7 +116,7 @@ public class KeyphraseEnrollmentInfo { 
        for (ResolveInfo ri : ris) {

            try {

                ApplicationInfo ai = pm.getApplicationInfo(

                        ri.serviceInfo.packageName, PackageManager.GET_META_DATA);

                        ri.activityInfo.packageName, PackageManager.GET_META_DATA);

                if ((ai.privateFlags & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) == 0) {

                    // The application isn't privileged (/system/priv-app).

                    // The enrollment application needs to be a privileged system app.
@@ -130,8 +130,6 @@ public class KeyphraseEnrollmentInfo { 
                    continue;

                }



                Slog.i(TAG, ai.packageName + " added to keyphrase");



                KeyphraseMetadata metadata =

                        getKeyphraseMetadataFromApplicationInfo(pm, ai, parseErrors);

                if (metadata != null) {
@@ -139,7 +137,7 @@ public class KeyphraseEnrollmentInfo { 
                }

            } catch (PackageManager.NameNotFoundException e) {

                String error = "error parsing voice enrollment meta-data for "

                        + ri.serviceInfo.packageName;

                        + ri.activityInfo.packageName;

                parseErrors.add(error + ": " + e);

                Slog.w(TAG, error, e);

            }
@@ -292,7 +290,7 @@ public class KeyphraseEnrollmentInfo { 
    }



    /**

     * Returns an intent to launch an service that manages the given keyphrase

     * Returns an intent to launch an activity that manages the given keyphrase

     * for the locale.

     *

     * @param action The enrollment related action that this intent is supposed to perform.

core/java/android/service/voice/AlwaysOnHotwordDetector.java

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.app.Activity;

import android.content.Intent;

import android.hardware.soundtrigger.IRecognitionStatusCallback;

import android.hardware.soundtrigger.KeyphraseEnrollmentInfo;
@@ -446,7 +446,7 @@ public class AlwaysOnHotwordDetector { 


    /**

     * Creates an intent to start the enrollment for the associated keyphrase.

     * This intent must be invoked using {@link Context#startForegroundService(Intent)}.

     * This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}.

     * Starting re-enrollment is only valid if the keyphrase is un-enrolled,

     * i.e. {@link #STATE_KEYPHRASE_UNENROLLED},

     * otherwise {@link #createReEnrollIntent()} should be preferred.
@@ -468,7 +468,7 @@ public class AlwaysOnHotwordDetector { 


    /**

     * Creates an intent to start the un-enrollment for the associated keyphrase.

     * This intent must be invoked using {@link Context#startForegroundService(Intent)}.

     * This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}.

     * Starting re-enrollment is only valid if the keyphrase is already enrolled,

     * i.e. {@link #STATE_KEYPHRASE_ENROLLED}, otherwise invoking this may result in an error.

     *
@@ -489,7 +489,7 @@ public class AlwaysOnHotwordDetector { 


    /**

     * Creates an intent to start the re-enrollment for the associated keyphrase.

     * This intent must be invoked using {@link Context#startForegroundService(Intent)}.

     * This intent must be invoked using {@link Activity#startActivityForResult(Intent, int)}.

     * Starting re-enrollment is only valid if the keyphrase is already enrolled,

     * i.e. {@link #STATE_KEYPHRASE_ENROLLED}, otherwise invoking this may result in an error.

     *