From ed4e8c3fab1443220de713cbbb92d526f68c7700 Mon Sep 17 00:00:00 2001 From: Kohsuke Yatoh Date: Tue, 24 Mar 2020 20:00:40 -0700 Subject: [PATCH] Allow DEFAULT_INPUT_METHOD to capture audio during RTT call Add content observer for Settings.Secure.DEFAULT_INPUT_METHOD, which contains package name of current InputMethodService. Bug: 147037345 Test: use voice input with Gboard 9.1.4 during a simulated RTT call. Change-Id: I11e17b13513627c88ccb8e4db66c5359e9ee7f7b --- core/jni/android_media_AudioSystem.cpp | 8 +++- media/java/android/media/AudioSystem.java | 5 +++ .../android/server/audio/AudioService.java | 40 +++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index ab3cf30578e91..c5a45882eceab 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -2266,6 +2266,11 @@ android_media_AudioSystem_setA11yServicesUids(JNIEnv *env, jobject thiz, jintArr return (jint)nativeToJavaStatus(status); } +static jint android_media_AudioSystem_setCurrentImeUid(JNIEnv *env, jobject thiz, jint uid) { + status_t status = AudioSystem::setCurrentImeUid(uid); + return (jint)nativeToJavaStatus(status); +} + static jboolean android_media_AudioSystem_isHapticPlaybackSupported(JNIEnv *env, jobject thiz) { @@ -2527,7 +2532,8 @@ static const JNINativeMethod gMethods[] = {"setUserIdDeviceAffinities", "(I[I[Ljava/lang/String;)I", (void *)android_media_AudioSystem_setUserIdDeviceAffinities}, {"removeUserIdDeviceAffinities", "(I)I", - (void *)android_media_AudioSystem_removeUserIdDeviceAffinities}}; + (void *)android_media_AudioSystem_removeUserIdDeviceAffinities}, + {"setCurrentImeUid", "(I)I", (void *)android_media_AudioSystem_setCurrentImeUid}}; static const JNINativeMethod gEventHandlerMethods[] = { {"native_setup", diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 0a56accd16367..155eb1cfbd46a 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -1233,6 +1233,11 @@ public class AudioSystem * Communicate UIDs of active accessibility services to audio policy service. */ public static native int setA11yServicesUids(int[] uids); + /** + * Communicate UID of current InputMethodService to audio policy service. + */ + public static native int setCurrentImeUid(int uid); + /** * @see AudioManager#isHapticPlaybackSupported() diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 8bce5043ad34e..f6cdaebc333ab 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -52,6 +52,7 @@ import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageManagerInternal; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.content.res.Configuration; @@ -576,6 +577,9 @@ public class AudioService extends IAudioService.Stub @GuardedBy("mSettingsLock") private int mAssistantUid; + @GuardedBy("mSettingsLock") + private int mCurrentImeUid; + private final Object mSupportedSystemUsagesLock = new Object(); @GuardedBy("mSupportedSystemUsagesLock") private @AttributeSystemUsage int[] mSupportedSystemUsages = @@ -1056,6 +1060,7 @@ public class AudioService extends IAudioService.Stub sendEncodedSurroundMode(mContentResolver, "onAudioServerDied"); sendEnabledSurroundFormats(mContentResolver, true); updateAssistantUId(true); + updateCurrentImeUid(true); AudioSystem.setRttEnabled(mRttEnabled); } synchronized (mAccessibilityServiceUidsLock) { @@ -1601,6 +1606,37 @@ public class AudioService extends IAudioService.Stub } } + @GuardedBy("mSettingsLock") + private void updateCurrentImeUid(boolean forceUpdate) { + String imeId = Settings.Secure.getStringForUser( + mContentResolver, + Settings.Secure.DEFAULT_INPUT_METHOD, UserHandle.USER_CURRENT); + if (TextUtils.isEmpty(imeId)) { + Log.e(TAG, "updateCurrentImeUid() could not find current IME"); + return; + } + ComponentName componentName = ComponentName.unflattenFromString(imeId); + if (componentName == null) { + Log.e(TAG, "updateCurrentImeUid() got invalid service name for " + + Settings.Secure.DEFAULT_INPUT_METHOD + ": " + imeId); + return; + } + String packageName = componentName.getPackageName(); + int currentUserId = LocalServices.getService(ActivityManagerInternal.class) + .getCurrentUserId(); + int currentImeUid = LocalServices.getService(PackageManagerInternal.class) + .getPackageUidInternal(packageName, 0 /* flags */, currentUserId); + if (currentImeUid < 0) { + Log.e(TAG, "updateCurrentImeUid() could not find UID for package: " + packageName); + return; + } + + if (currentImeUid != mCurrentImeUid || forceUpdate) { + AudioSystem.setCurrentImeUid(currentImeUid); + mCurrentImeUid = currentImeUid; + } + } + private void readPersistedSettings() { final ContentResolver cr = mContentResolver; @@ -1645,6 +1681,7 @@ public class AudioService extends IAudioService.Stub sendEncodedSurroundMode(cr, "readPersistedSettings"); sendEnabledSurroundFormats(cr, true); updateAssistantUId(true); + updateCurrentImeUid(true); AudioSystem.setRttEnabled(mRttEnabled); } @@ -5843,6 +5880,8 @@ public class AudioService extends IAudioService.Stub mContentResolver.registerContentObserver(Settings.Secure.getUriFor( Settings.Secure.VOICE_INTERACTION_SERVICE), false, this); + mContentResolver.registerContentObserver(Settings.Secure.getUriFor( + Settings.Secure.DEFAULT_INPUT_METHOD), false, this); } @Override @@ -5866,6 +5905,7 @@ public class AudioService extends IAudioService.Stub updateEncodedSurroundOutput(); sendEnabledSurroundFormats(mContentResolver, mSurroundModeChanged); updateAssistantUId(false); + updateCurrentImeUid(false); } }