Merge "Address API Review feedback for system API to allow preinstalled... (3b6c5289) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13051,7 +13051,7 @@ package android.service.voice {
	method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.HotwordDetector createHotwordDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.HotwordDetector.Callback);		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.HotwordDetector createHotwordDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.HotwordDetector.Callback);
	method @NonNull @RequiresPermission("android.permission.MANAGE_VOICE_KEYPHRASES") public final android.media.voice.KeyphraseModelManager createKeyphraseModelManager();		method @NonNull @RequiresPermission("android.permission.MANAGE_VOICE_KEYPHRASES") public final android.media.voice.KeyphraseModelManager createKeyphraseModelManager();
	method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.VisualQueryDetector createVisualQueryDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.VisualQueryDetector.Callback);		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public final android.service.voice.VisualQueryDetector createVisualQueryDetector(@Nullable android.os.PersistableBundle, @Nullable android.os.SharedMemory, @NonNull java.util.concurrent.Executor, @NonNull android.service.voice.VisualQueryDetector.Callback);
	method @FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public void setIsReceiveSandboxedTrainingDataAllowed(boolean);		method @FlaggedApi("android.service.voice.flags.allow_training_data_egress_from_hds") @RequiresPermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION) public void setShouldReceiveSandboxedTrainingData(boolean);
	}		}

	}		}

core/java/android/service/voice/VoiceInteractionService.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1042,13 +1042,13 @@ public class VoiceInteractionService extends Service {
	@SystemApi		@SystemApi
	@FlaggedApi(Flags.FLAG_ALLOW_TRAINING_DATA_EGRESS_FROM_HDS)		@FlaggedApi(Flags.FLAG_ALLOW_TRAINING_DATA_EGRESS_FROM_HDS)
	@RequiresPermission(Manifest.permission.MANAGE_HOTWORD_DETECTION)		@RequiresPermission(Manifest.permission.MANAGE_HOTWORD_DETECTION)
	public void setIsReceiveSandboxedTrainingDataAllowed(boolean allowed) {		public void setShouldReceiveSandboxedTrainingData(boolean allowed) {
	Log.i(TAG, "setIsReceiveSandboxedTrainingDataAllowed to " + allowed);		Log.i(TAG, "setShouldReceiveSandboxedTrainingData to " + allowed);
	if (mSystemService == null) {		if (mSystemService == null) {
	throw new IllegalStateException("Not available until onReady() is called");		throw new IllegalStateException("Not available until onReady() is called");
	}		}
	try {		try {
	mSystemService.setIsReceiveSandboxedTrainingDataAllowed(allowed);		mSystemService.setShouldReceiveSandboxedTrainingData(allowed);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowFromSystemServer();
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -397,5 +397,5 @@ interface IVoiceInteractionManagerService {
	* sandboxed detection (from trusted process).		* sandboxed detection (from trusted process).
	*/		*/
	@EnforcePermission("MANAGE_HOTWORD_DETECTION")		@EnforcePermission("MANAGE_HOTWORD_DETECTION")
	void setIsReceiveSandboxedTrainingDataAllowed(boolean allowed);		void setShouldReceiveSandboxedTrainingData(boolean allowed);
	}		}

services/tests/voiceinteractiontests/src/com/android/server/voiceinteraction/SetSandboxedTrainingDataAllowedTest.java

+8 −8

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1569,13 +1569,13 @@ public class VoiceInteractionManagerService extends SystemService {

	@Override		@Override
	@EnforcePermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION)		@EnforcePermission(android.Manifest.permission.MANAGE_HOTWORD_DETECTION)
	public void setIsReceiveSandboxedTrainingDataAllowed(boolean allowed) {		public void setShouldReceiveSandboxedTrainingData(boolean allowed) {
	super.setIsReceiveSandboxedTrainingDataAllowed_enforcePermission();		super.setShouldReceiveSandboxedTrainingData_enforcePermission();

	synchronized (this) {		synchronized (this) {
	if (mImpl == null) {		if (mImpl == null) {
	throw new IllegalStateException(		throw new IllegalStateException(
	"setIsReceiveSandboxedTrainingDataAllowed without running voice "		"setShouldReceiveSandboxedTrainingData without running voice "
	+ "interaction service");		+ "interaction service");
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -120,12 +120,12 @@ public class SetSandboxedTrainingDataAllowedTest {
	}		}

	@Test		@Test
	public void setIsReceiveSandboxedTrainingDataAllowed_currentAndPreinstalledAssistant_setsOp() {		public void setShouldReceiveSandboxedTrainingData_currentAndPreinstalledAssistant_setsOp() {
	// Set application info so current app is the current and preinstalled assistant.		// Set application info so current app is the current and preinstalled assistant.
	mApplicationInfo.uid = Process.myUid();		mApplicationInfo.uid = Process.myUid();
	mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;		mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;

	mVoiceInteractionManagerServiceStub.setIsReceiveSandboxedTrainingDataAllowed(		mVoiceInteractionManagerServiceStub.setShouldReceiveSandboxedTrainingData(
	/* allowed= */ true);		/* allowed= */ true);

	verify(mAppOpsManager).setUidMode(mOpIdCaptor.capture(), mUidCaptor.capture(),		verify(mAppOpsManager).setUidMode(mOpIdCaptor.capture(), mUidCaptor.capture(),
	@@ -137,7 +137,7 @@ public class SetSandboxedTrainingDataAllowedTest {
	}		}

	@Test		@Test
	public void setIsReceiveSandboxedTrainingDataAllowed_missingPermission_doesNotSetOp() {		public void setShouldReceiveSandboxedTrainingData_missingPermission_doesNotSetOp() {
	// Set application info so current app is the current and preinstalled assistant.		// Set application info so current app is the current and preinstalled assistant.
	mApplicationInfo.uid = Process.myUid();		mApplicationInfo.uid = Process.myUid();
	mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;		mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
	@@ -146,33 +146,33 @@ public class SetSandboxedTrainingDataAllowedTest {
	mPermissionEnforcer.revoke(Manifest.permission.MANAGE_HOTWORD_DETECTION);		mPermissionEnforcer.revoke(Manifest.permission.MANAGE_HOTWORD_DETECTION);

	assertThrows(SecurityException.class,		assertThrows(SecurityException.class,
	() -> mVoiceInteractionManagerServiceStub.setIsReceiveSandboxedTrainingDataAllowed(		() -> mVoiceInteractionManagerServiceStub.setShouldReceiveSandboxedTrainingData(
	/* allowed= */ true));		/* allowed= */ true));

	verify(mAppOpsManager, never()).setUidMode(anyInt(), anyInt(), anyInt());		verify(mAppOpsManager, never()).setUidMode(anyInt(), anyInt(), anyInt());
	}		}

	@Test		@Test
	public void setIsReceiveSandboxedTrainingDataAllowed_notPreinstalledAssistant_doesNotSetOp() {		public void setShouldReceiveSandboxedTrainingData_notPreinstalledAssistant_doesNotSetOp() {
	// Set application info so current app is not preinstalled assistant.		// Set application info so current app is not preinstalled assistant.
	mApplicationInfo.uid = Process.myUid();		mApplicationInfo.uid = Process.myUid();
	mApplicationInfo.flags = ApplicationInfo.FLAG_INSTALLED; // Does not contain FLAG_SYSTEM.		mApplicationInfo.flags = ApplicationInfo.FLAG_INSTALLED; // Does not contain FLAG_SYSTEM.

	assertThrows(SecurityException.class,		assertThrows(SecurityException.class,
	() -> mVoiceInteractionManagerServiceStub.setIsReceiveSandboxedTrainingDataAllowed(		() -> mVoiceInteractionManagerServiceStub.setShouldReceiveSandboxedTrainingData(
	/* allowed= */ true));		/* allowed= */ true));