Revert^2 "AudioProductStrategy: add a matching score API" (2d30e9d7) · Commits · e / os / android_frameworks_base

core/jni/android_media_AudioProductStrategies.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ static struct {
		jfieldID mVolumeGroupId;
		jfieldID mLegacyStreamType;
		jfieldID mAudioAttributes;
		jfieldID mStrategyId;
		} gAudioAttributesGroupsFields;

		static jclass gArrayListClass;
		@@ -130,6 +131,7 @@ static jint convertAudioProductStrategiesFromNative(
		gAudioAttributesGroupCstor,
		jGroupId,
		jLegacyStreamType,
		jStrategyId,
		jAudioAttributes);
		env->SetObjectArrayElement(jAudioAttributesGroups, indexGroup++, jAudioAttributesGroup);

		@@ -239,11 +241,13 @@ int register_android_media_AudioProductStrategies(JNIEnv *env)
		jclass audioAttributesGroupClass = FindClassOrDie(env, kAudioAttributesGroupsClassPathName);
		gAudioAttributesGroupClass = MakeGlobalRefOrDie(env, audioAttributesGroupClass);
		gAudioAttributesGroupCstor = GetMethodIDOrDie(env, audioAttributesGroupClass, "<init>",
		"(II[Landroid/media/AudioAttributes;)V");
		"(III[Landroid/media/AudioAttributes;)V");
		gAudioAttributesGroupsFields.mVolumeGroupId = GetFieldIDOrDie(
		env, audioAttributesGroupClass, "mVolumeGroupId", "I");
		gAudioAttributesGroupsFields.mLegacyStreamType = GetFieldIDOrDie(
		env, audioAttributesGroupClass, "mLegacyStreamType", "I");
		gAudioAttributesGroupsFields.mStrategyId = GetFieldIDOrDie(
		env, audioAttributesGroupClass, "mProductStrategyId", "I");
		gAudioAttributesGroupsFields.mAudioAttributes = GetFieldIDOrDie(
		env, audioAttributesGroupClass, "mAudioAttributes",
		"[Landroid/media/AudioAttributes;");

+252 −109

File changed.

Preview size limit exceeded, changes collapsed.