Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into... (a3fd8bfd) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

api/system-current.txt

+4 −4

api/test-current.txt

+4 −4

core/java/android/inputmethodservice/AbstractInputMethodService.java

+26 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,14 @@

	package android.inputmethodservice;		package android.inputmethodservice;

			import android.annotation.NonNull;
	import android.app.Service;		import android.app.Service;
	import android.content.Intent;		import android.content.Intent;
	import android.os.IBinder;		import android.os.IBinder;
	import android.view.KeyEvent;		import android.view.KeyEvent;
	import android.view.MotionEvent;		import android.view.MotionEvent;
			import android.view.inputmethod.InputConnection;
			import android.view.inputmethod.InputContentInfo;
	import android.view.inputmethod.InputMethod;		import android.view.inputmethod.InputMethod;
	import android.view.inputmethod.InputMethodSession;		import android.view.inputmethod.InputMethodSession;

	@@ -208,7 +211,7 @@ public abstract class AbstractInputMethodService extends Service
	*		*
	* @param event The motion event being received.		* @param event The motion event being received.
	* @return True if the event was handled in this function, false otherwise.		* @return True if the event was handled in this function, false otherwise.
	* @see View#onTrackballEvent		* @see android.view.View#onTrackballEvent(MotionEvent)
	*/		*/
	public boolean onTrackballEvent(MotionEvent event) {		public boolean onTrackballEvent(MotionEvent event) {
	return false;		return false;
	@@ -219,9 +222,30 @@ public abstract class AbstractInputMethodService extends Service
	*		*
	* @param event The motion event being received.		* @param event The motion event being received.
	* @return True if the event was handled in this function, false otherwise.		* @return True if the event was handled in this function, false otherwise.
	* @see View#onGenericMotionEvent		* @see android.view.View#onGenericMotionEvent(MotionEvent)
	*/		*/
	public boolean onGenericMotionEvent(MotionEvent event) {		public boolean onGenericMotionEvent(MotionEvent event) {
	return false;		return false;
	}		}

			/**
			* Allow the receiver of {@link InputContentInfo} to obtain a temporary read-only access
			* permission to the content.
			*
			* <p>Default implementation does nothing.</p>
			*
			* @param inputContentInfo Content to be temporarily exposed from the input method to the
			* application.
			* This cannot be {@code null}.
			* @param inputConnection {@link InputConnection} with which
			* {@link InputConnection#commitContent(InputContentInfo, int, android.os.Bundle)} will be
			* called.
			* @return {@code false} if we cannot allow a temporary access permission.
			* @hide
			*/
			public void exposeContent(@NonNull InputContentInfo inputContentInfo,
			@NonNull InputConnection inputConnection) {
			return;
			}

	}		}

core/java/android/inputmethodservice/IInputMethodWrapper.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -168,7 +168,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
	int missingMethods = msg.arg1;		int missingMethods = msg.arg1;
	IInputContext inputContext = (IInputContext)args.arg1;		IInputContext inputContext = (IInputContext)args.arg1;
	InputConnection ic = inputContext != null		InputConnection ic = inputContext != null
	? new InputConnectionWrapper(inputContext, missingMethods) : null;		? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null;
	EditorInfo info = (EditorInfo)args.arg2;		EditorInfo info = (EditorInfo)args.arg2;
	info.makeCompatible(mTargetSdkVersion);		info.makeCompatible(mTargetSdkVersion);
	inputMethod.startInput(ic, info);		inputMethod.startInput(ic, info);
	@@ -180,7 +180,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
	int missingMethods = msg.arg1;		int missingMethods = msg.arg1;
	IInputContext inputContext = (IInputContext)args.arg1;		IInputContext inputContext = (IInputContext)args.arg1;
	InputConnection ic = inputContext != null		InputConnection ic = inputContext != null
	? new InputConnectionWrapper(inputContext, missingMethods) : null;		? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null;
	EditorInfo info = (EditorInfo)args.arg2;		EditorInfo info = (EditorInfo)args.arg2;
	info.makeCompatible(mTargetSdkVersion);		info.makeCompatible(mTargetSdkVersion);
	inputMethod.restartInput(ic, info);		inputMethod.restartInput(ic, info);
	@@ -251,7 +251,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
	public void bindInput(InputBinding binding) {		public void bindInput(InputBinding binding) {
	// This IInputContext is guaranteed to implement all the methods.		// This IInputContext is guaranteed to implement all the methods.
	final int missingMethodFlags = 0;		final int missingMethodFlags = 0;
	InputConnection ic = new InputConnectionWrapper(		InputConnection ic = new InputConnectionWrapper(mTarget,
	IInputContext.Stub.asInterface(binding.getConnectionToken()), missingMethodFlags);		IInputContext.Stub.asInterface(binding.getConnectionToken()), missingMethodFlags);
	InputBinding nu = new InputBinding(ic, binding);		InputBinding nu = new InputBinding(ic, binding);
	mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_INPUT_CONTEXT, nu));		mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_INPUT_CONTEXT, nu));