Merge "Protect isInputMethodPickerShown() with TEST_INPUT_METHOD permission" (667a08b0) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/view/IInputMethodManager.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -81,7 +81,11 @@ interface IInputMethodManager {
		int auxiliarySubtypeMode, int displayId);

		void showInputMethodAndSubtypeEnablerFromClient(in IInputMethodClient client, String topId);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "
		+ "android.Manifest.permission.TEST_INPUT_METHOD)")
		boolean isInputMethodPickerShownForTest();

		InputMethodSubtype getCurrentInputMethodSubtype();
		void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);
		// This is kept due to @UnsupportedAppUsage.

core/res/AndroidManifest.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -4068,6 +4068,11 @@
		<permission android:name="android.permission.BIND_INPUT_METHOD"
		android:protectionLevel="signature" />

		<!-- Allows access to Test APIs defined in {@link android.view.inputmethod.InputMethodManager}.
		@hide -->
		<permission android:name="android.permission.TEST_INPUT_METHOD"
		android:protectionLevel="signature" />

		<!-- Must be required by an {@link android.media.midi.MidiDeviceService},
		to ensure that only the system can bind to it.
		<p>Protection level: signature

packages/Shell/AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -596,6 +596,9 @@
		<!-- Permission required for CTS test - ClipboardManagerTest -->
		<uses-permission android:name="android.permission.SET_CLIP_SOURCE" />

		<!-- Permission required for CTS test - CtsInputMethodTestCases -->
		<uses-permission android:name="android.permission.TEST_INPUT_METHOD" />

		<!-- Permission required for CTS test - FontManagerTest -->
		<uses-permission android:name="android.permission.UPDATE_FONTS" />

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -294,6 +294,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		final IWindowManager mIWindowManager;
		private final SparseBooleanArray mLoggedDeniedGetInputMethodWindowVisibleHeightForUid =
		new SparseBooleanArray(0);
		private final SparseBooleanArray mLoggedDeniedIsInputMethodPickerShownForTestForUid =
		new SparseBooleanArray(0);
		final WindowManagerInternal mWindowManagerInternal;
		final PackageManagerInternal mPackageManagerInternal;
		final InputManagerInternal mInputManagerInternal;
		@@ -1465,6 +1467,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		public void onUidRemoved(int uid) {
		synchronized (ImfLock.class) {
		mLoggedDeniedGetInputMethodWindowVisibleHeightForUid.delete(uid);
		mLoggedDeniedIsInputMethodPickerShownForTestForUid.delete(uid);
		}
		}

		@@ -4008,6 +4011,18 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
		* A test API for CTS to make sure that the input method menu is showing.
		*/
		public boolean isInputMethodPickerShownForTest() {
		if (mContext.checkCallingPermission(android.Manifest.permission.TEST_INPUT_METHOD)
		!= PackageManager.PERMISSION_GRANTED) {
		final int callingUid = Binder.getCallingUid();
		synchronized (ImfLock.class) {
		if (!mLoggedDeniedIsInputMethodPickerShownForTestForUid.get(callingUid)) {
		EventLog.writeEvent(0x534e4554, "237317525", callingUid, "");
		mLoggedDeniedIsInputMethodPickerShownForTestForUid.put(callingUid, true);
		}
		}
		throw new SecurityException(
		"isInputMethodPickerShownForTest requires TEST_INPUT_METHOD permission");
		}
		synchronized (ImfLock.class) {
		return mMenuController.isisInputMethodPickerShownForTestLocked();
		}