Merge "SoundTrigger system API changes." (46660571) · Commits · e / os / android_frameworks_base

api/system-current.txt

+32 −0

Original line number	Diff line number	Diff line
		@@ -23781,6 +23781,38 @@ package android.media.session {

		}

		package android.media.soundtrigger {

		public final class SoundTriggerDetector {
		method public boolean startRecognition();
		method public boolean stopRecognition();
		}

		public abstract class SoundTriggerDetector.Callback {
		ctor public SoundTriggerDetector.Callback();
		method public abstract void onAvailabilityChanged(int);
		method public abstract void onDetected();
		method public abstract void onError();
		method public abstract void onRecognitionPaused();
		method public abstract void onRecognitionResumed();
		}

		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 android.media.soundtrigger.SoundTriggerManager.Model getModel(java.util.UUID);
		method public void updateModel(android.media.soundtrigger.SoundTriggerManager.Model);
		}

		public static class SoundTriggerManager.Model {
		method public static android.media.soundtrigger.SoundTriggerManager.Model create(java.util.UUID, java.util.UUID, byte[]);
		method public byte[] getModelData();
		method public java.util.UUID getModelUuid();
		method public java.util.UUID getVendorUuid();
		}

		}

		package android.media.tv {

		public final class TvContentRating {

+4 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import java.util.UUID;
		*
		* @hide
		*/
		@SystemApi
		public final class SoundTriggerDetector {
		private static final boolean DBG = false;
		private static final String TAG = "SoundTriggerDetector";
		@@ -132,6 +133,9 @@ public final class SoundTriggerDetector {
		return true;
		}

		/**
		* @hide
		*/
		public void dump(String prefix, PrintWriter pw) {
		synchronized (mLock) {
		// TODO: Dump useful debug information.

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ import java.util.UUID;
		* OEMs to write apps that can manage non-voice based sound trigger models.
		*
		* @hide
		* TODO: Mark this as a SystemApi and get approval.
		*/
		@SystemApi
		public final class SoundTriggerManager {
		private static final boolean DBG = false;
		private static final String TAG = "SoundTriggerManager";