From ff66bbffac914d57c2c311fb603b00baba98c0ec Mon Sep 17 00:00:00 2001 From: Nicholas Ambur Date: Tue, 6 Apr 2021 13:14:42 -0700 Subject: [PATCH] rm permission from getActiveServiceComponentName remove the ACCESS_VOICE_INTERACTION_SERVICE permission from VoiceInteractionManagerService.getActiveServiceComponentName Test: build and verify no stability impact Bug: 173122149 Change-Id: I9e42b7b6e205ec352b3cfbac51022dd7594d1d0f --- .../android/internal/app/IVoiceInteractionManagerService.aidl | 1 - .../server/voiceinteraction/VoiceInteractionManagerService.java | 1 - 2 files changed, 2 deletions(-) diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl index fffeb024caae5..5a5e745c24262 100644 --- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl +++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl @@ -116,7 +116,6 @@ interface IVoiceInteractionManagerService { KeyphraseMetadata getEnrolledKeyphraseMetadata(String keyphrase, String bcp47Locale); /** * @return the component name for the currently active voice interaction service - * @RequiresPermission Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE */ ComponentName getActiveServiceComponentName(); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index ccaeaf991467b..9aded899aaae7 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -1439,7 +1439,6 @@ public class VoiceInteractionManagerService extends SystemService { @Override public ComponentName getActiveServiceComponentName() { - enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE); synchronized (this) { return mImpl != null ? mImpl.mComponent : null; }