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

Commit 6156e981 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Allow exemption for VoiceRecognitionService if no VoiceInteraction"

parents 44f719b8 0dfabfa6

core/java/android/app/AppOpsManager.java

+3 −2
Original line number Diff line number Diff line
@@ -7643,8 +7643,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
@@ -3031,8 +3031,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) {