Merge "Have IMMS report IME UID to AudioService" into rvc-dev am: d61819746b... (9d01aab4) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManagerInternal.java

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@
	package android.media;		package android.media;

	import android.util.IntArray;		import android.util.IntArray;

	import com.android.server.LocalServices;		import com.android.server.LocalServices;

	/**		/**
	@@ -48,6 +49,18 @@ public abstract class AudioManagerInternal {

	public abstract void setAccessibilityServiceUids(IntArray uids);		public abstract void setAccessibilityServiceUids(IntArray uids);

			/**
			* Called by {@link com.android.server.inputmethod.InputMethodManagerService} to notify the UID
			* of the currently used {@link android.inputmethodservice.InputMethodService}.
			*
			* <p>The caller is expected to take care of any performance implications, e.g. by using a
			* background thread to call this method.</p>
			*
			* @param uid UID of the currently used {@link android.inputmethodservice.InputMethodService}.
			* {@link android.os.Process#INVALID_UID} if no IME is active.
			*/
			public abstract void setInputMethodServiceUid(int uid);

	public interface RingerModeDelegate {		public interface RingerModeDelegate {
	/** Called when external ringer mode is evaluated, returns the new internal ringer mode */		/** Called when external ringer mode is evaluated, returns the new internal ringer mode */
	int onSetRingerModeExternal(int ringerModeOld, int ringerModeNew, String caller,		int onSetRingerModeExternal(int ringerModeOld, int ringerModeNew, String caller,

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

+20 −37

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,6 @@ import android.content.IntentFilter;
	import android.content.pm.ApplicationInfo;		import android.content.pm.ApplicationInfo;
	import android.content.pm.PackageInfo;		import android.content.pm.PackageInfo;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	import android.content.pm.PackageManagerInternal;
	import android.content.pm.ResolveInfo;		import android.content.pm.ResolveInfo;
	import android.content.pm.UserInfo;		import android.content.pm.UserInfo;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	@@ -570,6 +569,10 @@ public class AudioService extends IAudioService.Stub
	private int[] mAccessibilityServiceUids;		private int[] mAccessibilityServiceUids;
	private final Object mAccessibilityServiceUidsLock = new Object();		private final Object mAccessibilityServiceUidsLock = new Object();

			// Uid of the active input method service to check if caller is the one or not.
			private int mInputMethodServiceUid = android.os.Process.INVALID_UID;
			private final Object mInputMethodServiceUidLock = new Object();

	private int mEncodedSurroundMode;		private int mEncodedSurroundMode;
	private String mEnabledSurroundFormats;		private String mEnabledSurroundFormats;
	private boolean mSurroundModeChanged;		private boolean mSurroundModeChanged;
	@@ -1078,12 +1081,14 @@ public class AudioService extends IAudioService.Stub
	sendEncodedSurroundMode(mContentResolver, "onAudioServerDied");		sendEncodedSurroundMode(mContentResolver, "onAudioServerDied");
	sendEnabledSurroundFormats(mContentResolver, true);		sendEnabledSurroundFormats(mContentResolver, true);
	updateAssistantUId(true);		updateAssistantUId(true);
	updateCurrentImeUid(true);
	AudioSystem.setRttEnabled(mRttEnabled);		AudioSystem.setRttEnabled(mRttEnabled);
	}		}
	synchronized (mAccessibilityServiceUidsLock) {		synchronized (mAccessibilityServiceUidsLock) {
	AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);		AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);
	}		}
			synchronized (mInputMethodServiceUidLock) {
			mAudioSystem.setCurrentImeUid(mInputMethodServiceUid);
			}
	synchronized (mHdmiClientLock) {		synchronized (mHdmiClientLock) {
	if (mHdmiManager != null && mHdmiTvClient != null) {		if (mHdmiManager != null && mHdmiTvClient != null) {
	setHdmiSystemAudioSupported(mHdmiSystemAudioSupported);		setHdmiSystemAudioSupported(mHdmiSystemAudioSupported);
	@@ -1629,37 +1634,6 @@ 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) {
	mAudioSystem.setCurrentImeUid(currentImeUid);
	mCurrentImeUid = currentImeUid;
	}
	}

	private void readPersistedSettings() {		private void readPersistedSettings() {
	if (!mSystemServer.isPrivileged()) {		if (!mSystemServer.isPrivileged()) {
	return;		return;
	@@ -1707,7 +1681,6 @@ public class AudioService extends IAudioService.Stub
	sendEncodedSurroundMode(cr, "readPersistedSettings");		sendEncodedSurroundMode(cr, "readPersistedSettings");
	sendEnabledSurroundFormats(cr, true);		sendEnabledSurroundFormats(cr, true);
	updateAssistantUId(true);		updateAssistantUId(true);
	updateCurrentImeUid(true);
	AudioSystem.setRttEnabled(mRttEnabled);		AudioSystem.setRttEnabled(mRttEnabled);
	}		}

	@@ -6241,8 +6214,6 @@ 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.DEFAULT_INPUT_METHOD), false, this);
	}		}

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

	@@ -7608,6 +7578,19 @@ public class AudioService extends IAudioService.Stub
	AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);		AudioSystem.setA11yServicesUids(mAccessibilityServiceUids);
	}		}
	}		}

			/**
			* {@inheritDoc}
			*/
			@Override
			public void setInputMethodServiceUid(int uid) {
			synchronized (mInputMethodServiceUidLock) {
			if (mInputMethodServiceUid != uid) {
			mAudioSystem.setCurrentImeUid(uid);
			mInputMethodServiceUid = uid;
			}
			}
			}
	}		}

	//==========================================================================================		//==========================================================================================

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+50 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,7 @@ import android.content.ServiceConnection;
	import android.content.pm.ApplicationInfo;		import android.content.pm.ApplicationInfo;
	import android.content.pm.IPackageManager;		import android.content.pm.IPackageManager;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
			import android.content.pm.PackageManagerInternal;
	import android.content.pm.ResolveInfo;		import android.content.pm.ResolveInfo;
	import android.content.pm.ServiceInfo;		import android.content.pm.ServiceInfo;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	@@ -67,6 +68,7 @@ import android.graphics.drawable.Drawable;
	import android.hardware.display.DisplayManagerInternal;		import android.hardware.display.DisplayManagerInternal;
	import android.hardware.input.InputManagerInternal;		import android.hardware.input.InputManagerInternal;
	import android.inputmethodservice.InputMethodService;		import android.inputmethodservice.InputMethodService;
			import android.media.AudioManagerInternal;
	import android.net.Uri;		import android.net.Uri;
	import android.os.Binder;		import android.os.Binder;
	import android.os.Bundle;		import android.os.Bundle;
	@@ -223,6 +225,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub

	static final int MSG_INLINE_SUGGESTIONS_REQUEST = 6000;		static final int MSG_INLINE_SUGGESTIONS_REQUEST = 6000;

			static final int MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE = 7000;

	static final long TIME_TO_RECONNECT = 3 * 1000;		static final long TIME_TO_RECONNECT = 3 * 1000;

	static final int SECURE_SUGGESTION_SPANS_MAX_SIZE = 20;		static final int SECURE_SUGGESTION_SPANS_MAX_SIZE = 20;
	@@ -308,6 +312,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	final SettingsObserver mSettingsObserver;		final SettingsObserver mSettingsObserver;
	final IWindowManager mIWindowManager;		final IWindowManager mIWindowManager;
	final WindowManagerInternal mWindowManagerInternal;		final WindowManagerInternal mWindowManagerInternal;
			final PackageManagerInternal mPackageManagerInternal;
	final InputManagerInternal mInputManagerInternal;		final InputManagerInternal mInputManagerInternal;
	private final DisplayManagerInternal mDisplayManagerInternal;		private final DisplayManagerInternal mDisplayManagerInternal;
	final HandlerCaller mCaller;		final HandlerCaller mCaller;
	@@ -320,6 +325,16 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	private final UserManager mUserManager;		private final UserManager mUserManager;
	private final UserManagerInternal mUserManagerInternal;		private final UserManagerInternal mUserManagerInternal;

			/**
			* Cache the result of {@code LocalServices.getService(AudioManagerInternal.class)}.
			*
			* <p>This field is used only within {@link #handleMessage(Message)} hence synchronization is
			* not necessary.</p>
			*/
			@Nullable
			private AudioManagerInternal mAudioManagerInternal = null;


	// All known input methods. mMethodMap also serves as the global		// All known input methods. mMethodMap also serves as the global
	// lock for this class.		// lock for this class.
	final ArrayList<InputMethodInfo> mMethodList = new ArrayList<>();		final ArrayList<InputMethodInfo> mMethodList = new ArrayList<>();
	@@ -642,6 +657,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	*/		*/
	IInputMethod mCurMethod;		IInputMethod mCurMethod;

			/**
			* If not {@link Process#INVALID_UID}, then the UID of {@link #mCurIntent}.
			*/
			int mCurMethodUid = Process.INVALID_UID;

	/**		/**
	* Time that we last initiated a bind to the input method, to determine		* Time that we last initiated a bind to the input method, to determine
	* if we should try to disconnect and reconnect to it.		* if we should try to disconnect and reconnect to it.
	@@ -1625,6 +1645,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	mIWindowManager = IWindowManager.Stub.asInterface(		mIWindowManager = IWindowManager.Stub.asInterface(
	ServiceManager.getService(Context.WINDOW_SERVICE));		ServiceManager.getService(Context.WINDOW_SERVICE));
	mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class);		mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class);
			mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
	mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);		mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);
	mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);		mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
	mImeDisplayValidator = displayId -> mWindowManagerInternal.shouldShowIme(displayId);		mImeDisplayValidator = displayId -> mWindowManagerInternal.shouldShowIme(displayId);
	@@ -2521,11 +2542,26 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	return checker.displayCanShowIme(displayId) ? displayId : FALLBACK_DISPLAY_ID;		return checker.displayCanShowIme(displayId) ? displayId : FALLBACK_DISPLAY_ID;
	}		}

			@AnyThread
			private void scheduleNotifyImeUidToAudioService(int uid) {
			mCaller.removeMessages(MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE);
			mCaller.obtainMessageI(MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE, uid).sendToTarget();
			}

	@Override		@Override
	public void onServiceConnected(ComponentName name, IBinder service) {		public void onServiceConnected(ComponentName name, IBinder service) {
	synchronized (mMethodMap) {		synchronized (mMethodMap) {
	if (mCurIntent != null && name.equals(mCurIntent.getComponent())) {		if (mCurIntent != null && name.equals(mCurIntent.getComponent())) {
	mCurMethod = IInputMethod.Stub.asInterface(service);		mCurMethod = IInputMethod.Stub.asInterface(service);
			final String curMethodPackage = mCurIntent.getComponent().getPackageName();
			final int curMethodUid = mPackageManagerInternal.getPackageUidInternal(
			curMethodPackage, 0 /* flags */, mSettings.getCurrentUserId());
			if (curMethodUid < 0) {
			Slog.e(TAG, "Failed to get UID for package=" + curMethodPackage);
			mCurMethodUid = Process.INVALID_UID;
			} else {
			mCurMethodUid = curMethodUid;
			}
	if (mCurToken == null) {		if (mCurToken == null) {
	Slog.w(TAG, "Service connected without a token!");		Slog.w(TAG, "Service connected without a token!");
	unbindCurrentMethodLocked();		unbindCurrentMethodLocked();
	@@ -2535,6 +2571,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	// Dispatch display id for InputMethodService to update context display.		// Dispatch display id for InputMethodService to update context display.
	executeOrSendMessage(mCurMethod, mCaller.obtainMessageIOO(		executeOrSendMessage(mCurMethod, mCaller.obtainMessageIOO(
	MSG_INITIALIZE_IME, mCurTokenDisplayId, mCurMethod, mCurToken));		MSG_INITIALIZE_IME, mCurTokenDisplayId, mCurMethod, mCurToken));
			scheduleNotifyImeUidToAudioService(mCurMethodUid);
	if (mCurClient != null) {		if (mCurClient != null) {
	clearClientSessionLocked(mCurClient);		clearClientSessionLocked(mCurClient);
	requestClientSessionLocked(mCurClient);		requestClientSessionLocked(mCurClient);
	@@ -2656,6 +2693,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	finishSessionLocked(mEnabledSession);		finishSessionLocked(mEnabledSession);
	mEnabledSession = null;		mEnabledSession = null;
	mCurMethod = null;		mCurMethod = null;
			mCurMethodUid = Process.INVALID_UID;
			scheduleNotifyImeUidToAudioService(mCurMethodUid);
	}		}
	if (mStatusBar != null) {		if (mStatusBar != null) {
	mStatusBar.setIconVisibility(mSlotIme, false);		mStatusBar.setIconVisibility(mSlotIme, false);
	@@ -4277,6 +4316,17 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
	args.recycle();		args.recycle();
	return true;		return true;
	}		}

			// ---------------------------------------------------------------
			case MSG_NOTIFY_IME_UID_TO_AUDIO_SERVICE: {
			if (mAudioManagerInternal == null) {
			mAudioManagerInternal = LocalServices.getService(AudioManagerInternal.class);
			}
			if (mAudioManagerInternal != null) {
			mAudioManagerInternal.setInputMethodServiceUid(msg.arg1 /* uid */);
			}
			return true;
			}
	}		}
	return false;		return false;
	}		}