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

Commit 6fb83178 authored by Nicholas Ambur's avatar Nicholas Ambur Committed by Android (Google) Code Review
Browse files

Merge "rm permission from getActiveServiceComponentName" into sc-dev

parents 266e0913 ff66bbff

core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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();

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -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;

            }