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

Commit 0dfabfa6 authored by Nate Myren's avatar Nate Myren
Browse files

Allow exemption for VoiceRecognitionService if no VoiceInteraction 

If there is no VoiceInteractionService set, allow the current
VoiceRecognitionService to be trusted. For example, when "Basic Google
Recognition" is selected in settings, for some assistant other than
Google, there is no Voice Interaction Service set

Test: manual
Bug: 162547999
Change-Id: I10385ee97d2ebc8597876cfd02168878720ad7e7
parent 4cf0958a

core/java/android/app/AppOpsManager.java

+3 −2
Original line number Diff line number Diff line
@@ -7621,8 +7621,9 @@ public class AppOpsManager { 
                getComponentPackageNameFromString(voiceRecognitionComponent);

        final String voiceInteractionServicePackageName =

                getComponentPackageNameFromString(voiceInteractionComponent);

        return Objects.equals(packageName, voiceRecognitionServicePackageName) && Objects.equals(

                voiceRecognitionServicePackageName, voiceInteractionServicePackageName);

        return (Objects.equals(packageName, voiceRecognitionServicePackageName)) && (Objects.equals(

                voiceRecognitionServicePackageName, voiceInteractionServicePackageName)

                || voiceInteractionServicePackageName == null);

    }



    private String getComponentPackageNameFromString(String from) {

services/core/java/com/android/server/appop/AppOpsService.java

+3 −2
Original line number Diff line number Diff line
@@ -3029,8 +3029,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
                getComponentPackageNameFromString(voiceRecognitionComponent);

        final String voiceInteractionServicePackageName =

                getComponentPackageNameFromString(voiceInteractionComponent);

        return Objects.equals(packageName, voiceRecognitionServicePackageName) && Objects.equals(

                voiceRecognitionServicePackageName, voiceInteractionServicePackageName);

        return (Objects.equals(packageName, voiceRecognitionServicePackageName)) && (Objects.equals(

                voiceRecognitionServicePackageName, voiceInteractionServicePackageName)

                || voiceInteractionServicePackageName == null);

    }



    private String getComponentPackageNameFromString(String from) {