Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev (cb569789) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -18858,7 +18858,6 @@ package android.inputmethodservice {
		public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
		ctor public InputMethodService();
		method public deprecated boolean enableHardwareAcceleration();
		method public final boolean exposeContent(android.view.inputmethod.InputContentInfo, android.view.inputmethod.EditorInfo);
		method public int getBackDisposition();
		method public int getCandidatesHiddenVisibility();
		method public android.view.inputmethod.InputBinding getCurrentInputBinding();
		@@ -44682,7 +44681,7 @@ package android.view.inputmethod {
		method public boolean clearMetaKeyStates(int);
		method public void closeConnection();
		method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public boolean commitText(java.lang.CharSequence, int);
		method public boolean deleteSurroundingText(int, int);
		@@ -44852,7 +44851,7 @@ package android.view.inputmethod {
		method public abstract boolean clearMetaKeyStates(int);
		method public abstract void closeConnection();
		method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public abstract boolean commitText(java.lang.CharSequence, int);
		method public abstract boolean deleteSurroundingText(int, int);
		@@ -44878,6 +44877,7 @@ package android.view.inputmethod {
		field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
		field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
		field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
		field public static final int INPUT_CONTENT_GRANT_READ_URI_PERMISSION = 1; // 0x1
		}

		public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
		@@ -44886,7 +44886,7 @@ package android.view.inputmethod {
		method public boolean clearMetaKeyStates(int);
		method public void closeConnection();
		method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public boolean commitText(java.lang.CharSequence, int);
		method public boolean deleteSurroundingText(int, int);

api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -20058,7 +20058,6 @@ package android.inputmethodservice {
		public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
		ctor public InputMethodService();
		method public deprecated boolean enableHardwareAcceleration();
		method public final boolean exposeContent(android.view.inputmethod.InputContentInfo, android.view.inputmethod.EditorInfo);
		method public int getBackDisposition();
		method public int getCandidatesHiddenVisibility();
		method public android.view.inputmethod.InputBinding getCurrentInputBinding();
		@@ -47810,7 +47809,7 @@ package android.view.inputmethod {
		method public boolean clearMetaKeyStates(int);
		method public void closeConnection();
		method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public boolean commitText(java.lang.CharSequence, int);
		method public boolean deleteSurroundingText(int, int);
		@@ -47980,7 +47979,7 @@ package android.view.inputmethod {
		method public abstract boolean clearMetaKeyStates(int);
		method public abstract void closeConnection();
		method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public abstract boolean commitText(java.lang.CharSequence, int);
		method public abstract boolean deleteSurroundingText(int, int);
		@@ -48006,6 +48005,7 @@ package android.view.inputmethod {
		field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
		field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
		field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
		field public static final int INPUT_CONTENT_GRANT_READ_URI_PERMISSION = 1; // 0x1
		}

		public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
		@@ -48014,7 +48014,7 @@ package android.view.inputmethod {
		method public boolean clearMetaKeyStates(int);
		method public void closeConnection();
		method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public boolean commitText(java.lang.CharSequence, int);
		method public boolean deleteSurroundingText(int, int);

api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -18872,7 +18872,6 @@ package android.inputmethodservice {
		public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
		ctor public InputMethodService();
		method public deprecated boolean enableHardwareAcceleration();
		method public final boolean exposeContent(android.view.inputmethod.InputContentInfo, android.view.inputmethod.EditorInfo);
		method public int getBackDisposition();
		method public int getCandidatesHiddenVisibility();
		method public android.view.inputmethod.InputBinding getCurrentInputBinding();
		@@ -44762,7 +44761,7 @@ package android.view.inputmethod {
		method public boolean clearMetaKeyStates(int);
		method public void closeConnection();
		method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public boolean commitText(java.lang.CharSequence, int);
		method public boolean deleteSurroundingText(int, int);
		@@ -44932,7 +44931,7 @@ package android.view.inputmethod {
		method public abstract boolean clearMetaKeyStates(int);
		method public abstract void closeConnection();
		method public abstract boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public abstract boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public abstract boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public abstract boolean commitText(java.lang.CharSequence, int);
		method public abstract boolean deleteSurroundingText(int, int);
		@@ -44958,6 +44957,7 @@ package android.view.inputmethod {
		field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
		field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
		field public static final int GET_TEXT_WITH_STYLES = 1; // 0x1
		field public static final int INPUT_CONTENT_GRANT_READ_URI_PERMISSION = 1; // 0x1
		}

		public class InputConnectionWrapper implements android.view.inputmethod.InputConnection {
		@@ -44966,7 +44966,7 @@ package android.view.inputmethod {
		method public boolean clearMetaKeyStates(int);
		method public void closeConnection();
		method public boolean commitCompletion(android.view.inputmethod.CompletionInfo);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, android.os.Bundle);
		method public boolean commitContent(android.view.inputmethod.InputContentInfo, int, android.os.Bundle);
		method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
		method public boolean commitText(java.lang.CharSequence, int);
		method public boolean deleteSurroundingText(int, int);

core/java/android/inputmethodservice/AbstractInputMethodService.java

+26 −2

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

		package android.inputmethodservice;

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

		@@ -208,7 +211,7 @@ public abstract class AbstractInputMethodService extends Service
		*
		* @param event The motion event being received.
		* @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) {
		return false;
		@@ -219,9 +222,30 @@ public abstract class AbstractInputMethodService extends Service
		*
		* @param event The motion event being received.
		* @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) {
		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	Diff line number	Diff line
		@@ -168,7 +168,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
		int missingMethods = msg.arg1;
		IInputContext inputContext = (IInputContext)args.arg1;
		InputConnection ic = inputContext != null
		? new InputConnectionWrapper(inputContext, missingMethods) : null;
		? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null;
		EditorInfo info = (EditorInfo)args.arg2;
		info.makeCompatible(mTargetSdkVersion);
		inputMethod.startInput(ic, info);
		@@ -180,7 +180,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
		int missingMethods = msg.arg1;
		IInputContext inputContext = (IInputContext)args.arg1;
		InputConnection ic = inputContext != null
		? new InputConnectionWrapper(inputContext, missingMethods) : null;
		? new InputConnectionWrapper(mTarget, inputContext, missingMethods) : null;
		EditorInfo info = (EditorInfo)args.arg2;
		info.makeCompatible(mTargetSdkVersion);
		inputMethod.restartInput(ic, info);
		@@ -251,7 +251,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
		public void bindInput(InputBinding binding) {
		// This IInputContext is guaranteed to implement all the methods.
		final int missingMethodFlags = 0;
		InputConnection ic = new InputConnectionWrapper(
		InputConnection ic = new InputConnectionWrapper(mTarget,
		IInputContext.Stub.asInterface(binding.getConnectionToken()), missingMethodFlags);
		InputBinding nu = new InputBinding(ic, binding);
		mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_INPUT_CONTEXT, nu));