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

Commit e9b1b09d authored May 09, 2023 by Treehugger Robot Committed by Automerger Merge Worker May 09, 2023

Merge "Add toString to ST recog event types" into udc-dev am: 05da757a am:...

Merge "Add toString to ST recog event types" into udc-dev am: 05da757a am: ad5b0c7a am: aa1ca772

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23075099

Change-Id: Ie4a556a2d518fd43d3e427d8284190602be166ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a542fce8 aa1ca772

media/aidl/android/media/soundtrigger_middleware/PhraseRecognitionEventSys.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.media.soundtrigger.PhraseRecognitionEvent;
	* Wrapper to android.media.soundtrigger.RecognitionEvent providing additional fields used by the		* Wrapper to android.media.soundtrigger.RecognitionEvent providing additional fields used by the
	* framework.		* framework.
	*/		*/
			@JavaDerive(equals = true, toString = true)
	parcelable PhraseRecognitionEventSys {		parcelable PhraseRecognitionEventSys {

	PhraseRecognitionEvent phraseRecognitionEvent;		PhraseRecognitionEvent phraseRecognitionEvent;

media/aidl/android/media/soundtrigger_middleware/RecognitionEventSys.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.media.soundtrigger.RecognitionEvent;
	* Wrapper to android.media.soundtrigger.RecognitionEvent providing additional fields used by the		* Wrapper to android.media.soundtrigger.RecognitionEvent providing additional fields used by the
	* framework.		* framework.
	*/		*/
			@JavaDerive(equals = true, toString = true)
	parcelable RecognitionEventSys {		parcelable RecognitionEventSys {

	RecognitionEvent recognitionEvent;		RecognitionEvent recognitionEvent;