Add SoundTriggerDetectionService am: 18e3eb8168 (6951f56b) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,8 @@ java_library {
		"media/java/android/media/session/ISessionController.aidl",
		"media/java/android/media/session/ISessionControllerCallback.aidl",
		"media/java/android/media/session/ISessionManager.aidl",
		"media/java/android/media/soundtrigger/ISoundTriggerDetectionService.aidl",
		"media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.aidl",
		"media/java/android/media/tv/ITvInputClient.aidl",
		"media/java/android/media/tv/ITvInputHardware.aidl",
		"media/java/android/media/tv/ITvInputHardwareCallback.aidl",

api/system-current.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ package android {
		field public static final java.lang.String BIND_RESOLVER_RANKER_SERVICE = "android.permission.BIND_RESOLVER_RANKER_SERVICE";
		field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";
		field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";
		field public static final java.lang.String BIND_SOUND_TRIGGER_DETECTION_SERVICE = "android.permission.BIND_SOUND_TRIGGER_DETECTION_SERVICE";
		field public static final java.lang.String BIND_TELEPHONY_DATA_SERVICE = "android.permission.BIND_TELEPHONY_DATA_SERVICE";
		field public static final java.lang.String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";
		field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";
		@@ -2753,6 +2754,16 @@ package android.media.session {

		package android.media.soundtrigger {

		public abstract class SoundTriggerDetectionService extends android.app.Service {
		ctor public SoundTriggerDetectionService();
		method public void onConnected(java.util.UUID, android.os.Bundle);
		method public void onDisconnected(java.util.UUID, android.os.Bundle);
		method public void onError(java.util.UUID, android.os.Bundle, int, int);
		method public void onGenericRecognitionEvent(java.util.UUID, android.os.Bundle, int, android.hardware.soundtrigger.SoundTrigger.RecognitionEvent);
		method public abstract void onStopOperation(java.util.UUID, android.os.Bundle, int);
		method public final void operationFinished(java.util.UUID, int);
		}

		public final class SoundTriggerDetector {
		method public boolean startRecognition(int);
		method public boolean stopRecognition();
		@@ -2777,6 +2788,7 @@ package android.media.soundtrigger {
		public final class SoundTriggerManager {
		method public android.media.soundtrigger.SoundTriggerDetector createSoundTriggerDetector(java.util.UUID, android.media.soundtrigger.SoundTriggerDetector.Callback, android.os.Handler);
		method public void deleteModel(java.util.UUID);
		method public int getDetectionServiceOperationsTimeout();
		method public android.media.soundtrigger.SoundTriggerManager.Model getModel(java.util.UUID);
		method public void updateModel(android.media.soundtrigger.SoundTriggerManager.Model);
		}

core/java/android/app/ApplicationPackageManager.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.DrawableRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StringRes;
		import android.annotation.UserIdInt;
		import android.annotation.XmlRes;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		@@ -1031,18 +1032,24 @@ public class ApplicationPackageManager extends PackageManager {
		}

		@Override
		public ResolveInfo resolveService(Intent intent, int flags) {
		public ResolveInfo resolveServiceAsUser(Intent intent, @ResolveInfoFlags int flags,
		@UserIdInt int userId) {
		try {
		return mPM.resolveService(
		intent,
		intent.resolveTypeIfNeeded(mContext.getContentResolver()),
		flags,
		mContext.getUserId());
		userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		@Override
		public ResolveInfo resolveService(Intent intent, int flags) {
		return resolveServiceAsUser(intent, flags, mContext.getUserId());
		}

		@Override
		@SuppressWarnings("unchecked")
		public List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int flags, int userId) {

core/java/android/content/pm/PackageManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -4182,6 +4182,12 @@ public abstract class PackageManager {
		*/
		public abstract ResolveInfo resolveService(Intent intent, @ResolveInfoFlags int flags);

		/**
		* @hide
		*/
		public abstract ResolveInfo resolveServiceAsUser(Intent intent, @ResolveInfoFlags int flags,
		@UserIdInt int userId);

		/**
		* Retrieve all services that can match the given intent.
		*

core/java/android/provider/Settings.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -11606,6 +11606,24 @@ public final class Settings {
		public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS =
		"hidden_api_blacklist_exemptions";

		/**
		* Timeout for a single {@link android.media.soundtrigger.SoundTriggerDetectionService}
		* operation (in ms).
		*
		* @hide
		*/
		public static final String SOUND_TRIGGER_DETECTION_SERVICE_OP_TIMEOUT =
		"sound_trigger_detection_service_op_timeout";

		/**
		* Maximum number of {@link android.media.soundtrigger.SoundTriggerDetectionService}
		* operations per day.
		*
		* @hide
		*/
		public static final String MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY =
		"max_sound_trigger_detection_service_ops_per_day";

		/**
		* Settings to backup. This is here so that it's in the same place as the settings
		* keys and easy to update.