Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "audioservice: add RTT mode observer" into qt-dev

Browse Source 
am: a66bfb90b6

Change-Id: I9b0e2ac080e648bf42ad4f3e1e787daa651a4b91
This commit is contained in:
Eric Laurent
2019-06-11 18:33:35 -07:00
committed by android-build-merger
parent ac7800011d a66bfb90b6
commit fef36889bb
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_media_AudioSystem.cpp
View File

@@ -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[] = {

3
media/java/android/media/AudioSystem.java
View File

@@ -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

11
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -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);
} }
} }