Merge "rm permission from getActiveServiceComponentName" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6fb83178e0
@@ -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();
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user