Merge "audioservice: add RTT mode observer" into qt-dev (a66bfb90) · Commits · e / os / android_frameworks_base

core/jni/android_media_AudioSystem.cpp

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2242,6 +2242,12 @@ android_media_AudioSystem_setAllowedCapturePolicy(JNIEnv *env, jobject thiz, jin
	return AudioSystem::setAllowedCapturePolicy(uid, flags);		return AudioSystem::setAllowedCapturePolicy(uid, flags);
	}		}

			static jint
			android_media_AudioSystem_setRttEnabled(JNIEnv *env, jobject thiz, jboolean enabled)
			{
			return (jint) check_AudioSystem_Command(AudioSystem::setRttEnabled(enabled));
			}

	// ----------------------------------------------------------------------------		// ----------------------------------------------------------------------------

	static const JNINativeMethod gMethods[] = {		static const JNINativeMethod gMethods[] = {
	@@ -2319,6 +2325,7 @@ static const JNINativeMethod gMethods[] = {
	{"getHwOffloadEncodingFormatsSupportedForA2DP", "(Ljava/util/ArrayList;)I",		{"getHwOffloadEncodingFormatsSupportedForA2DP", "(Ljava/util/ArrayList;)I",
	(void*)android_media_AudioSystem_getHwOffloadEncodingFormatsSupportedForA2DP},		(void*)android_media_AudioSystem_getHwOffloadEncodingFormatsSupportedForA2DP},
	{"setAllowedCapturePolicy", "(II)I", (void *)android_media_AudioSystem_setAllowedCapturePolicy},		{"setAllowedCapturePolicy", "(II)I", (void *)android_media_AudioSystem_setAllowedCapturePolicy},
			{"setRttEnabled", "(Z)I", (void *)android_media_AudioSystem_setRttEnabled},
	};		};

	static const JNINativeMethod gEventHandlerMethods[] = {		static const JNINativeMethod gEventHandlerMethods[] = {

media/java/android/media/AudioSystem.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import android.content.Context;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	import android.media.audiofx.AudioEffect;		import android.media.audiofx.AudioEffect;
	import android.media.audiopolicy.AudioMix;		import android.media.audiopolicy.AudioMix;
	import android.os.Build;
	import android.util.Log;		import android.util.Log;

	import java.util.ArrayList;		import java.util.ArrayList;
	@@ -981,6 +980,8 @@ public class AudioSystem
	public static native boolean getMasterMono();		public static native boolean getMasterMono();
	/** @hide enables or disables the master mono mode. */		/** @hide enables or disables the master mono mode. */
	public static native int setMasterMono(boolean mono);		public static native int setMasterMono(boolean mono);
			/** @hide enables or disables the RTT mode. */
			public static native int setRttEnabled(boolean enabled);

	/** @hide returns master balance value in range -1.f -> 1.f, where 0.f is dead center. */		/** @hide returns master balance value in range -1.f -> 1.f, where 0.f is dead center. */
	@TestApi		@TestApi

services/core/java/com/android/server/audio/AudioService.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1016,6 +1016,7 @@ public class AudioService extends IAudioService.Stub
	sendEncodedSurroundMode(mContentResolver, "onAudioServerDied");		sendEncodedSurroundMode(mContentResolver, "onAudioServerDied");
	sendEnabledSurroundFormats(mContentResolver, true);		sendEnabledSurroundFormats(mContentResolver, true);
	updateAssistantUId(true);		updateAssistantUId(true);
			updateRttEanbled(mContentResolver);
	}		}
	synchronized (mAccessibilityServiceUidsLock) {		synchronized (mAccessibilityServiceUidsLock) {
	AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);		AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);
	@@ -1480,6 +1481,12 @@ public class AudioService extends IAudioService.Stub
	}		}
	}		}

			private void updateRttEanbled(ContentResolver cr) {
			final boolean rttEnabled = Settings.Secure.getIntForUser(cr,
			Settings.Secure.RTT_CALLING_MODE, 0, UserHandle.USER_CURRENT) != 0;
			AudioSystem.setRttEnabled(rttEnabled);
			}

	private void readPersistedSettings() {		private void readPersistedSettings() {
	final ContentResolver cr = mContentResolver;		final ContentResolver cr = mContentResolver;

	@@ -1524,6 +1531,7 @@ public class AudioService extends IAudioService.Stub
	sendEncodedSurroundMode(cr, "readPersistedSettings");		sendEncodedSurroundMode(cr, "readPersistedSettings");
	sendEnabledSurroundFormats(cr, true);		sendEnabledSurroundFormats(cr, true);
	updateAssistantUId(true);		updateAssistantUId(true);
			updateRttEanbled(cr);
	}		}

	mMuteAffectedStreams = System.getIntForUser(cr,		mMuteAffectedStreams = System.getIntForUser(cr,
	@@ -5502,6 +5510,8 @@ public class AudioService extends IAudioService.Stub

	mContentResolver.registerContentObserver(Settings.Secure.getUriFor(		mContentResolver.registerContentObserver(Settings.Secure.getUriFor(
	Settings.Secure.VOICE_INTERACTION_SERVICE), false, this);		Settings.Secure.VOICE_INTERACTION_SERVICE), false, this);
			mContentResolver.registerContentObserver(Settings.Secure.getUriFor(
			Settings.Secure.RTT_CALLING_MODE), false, this);
	}		}

	@Override		@Override
	@@ -5525,6 +5535,7 @@ public class AudioService extends IAudioService.Stub
	updateEncodedSurroundOutput();		updateEncodedSurroundOutput();
	sendEnabledSurroundFormats(mContentResolver, mSurroundModeChanged);		sendEnabledSurroundFormats(mContentResolver, mSurroundModeChanged);
	updateAssistantUId(false);		updateAssistantUId(false);
			updateRttEanbled(mContentResolver);
	}		}
	}		}