Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Remove InputContentInfo#requestPermission()"" into nyc-mr1-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2016-06-30 19:30:19 +00:00
committed by Android (Google) Code Review
parent 536a1a2ae7 79d1c75a3f
commit 8acb1a7570
9 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -44923,6 +44923,7 @@ package android.view.inputmethod {
method public android.content.ClipDescription getDescription();
method public android.net.Uri getLinkUri();
method public void releasePermission();
method public void requestPermission();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.view.inputmethod.InputContentInfo> CREATOR;
}

1
api/system-current.txt
View File

@@ -48091,6 +48091,7 @@ package android.view.inputmethod {
method public android.content.ClipDescription getDescription();
method public android.net.Uri getLinkUri();
method public void releasePermission();
method public void requestPermission();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.view.inputmethod.InputContentInfo> CREATOR;
}

1
api/test-current.txt
View File

@@ -45003,6 +45003,7 @@ package android.view.inputmethod {
method public android.content.ClipDescription getDescription();
method public android.net.Uri getLinkUri();
method public void releasePermission();
method public void requestPermission();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.view.inputmethod.InputContentInfo> CREATOR;
}

9
core/java/android/view/inputmethod/InputConnection.java
View File

@@ -840,16 +840,15 @@ public interface InputConnection {
public void closeConnection();
/**
* When this flag is used in {@link #commitContent(InputContentInfo, int, Bundle)}, the editor
* will be able to request read access to the content URI contained in the
* {@link InputContentInfo} object.
* When this flag is used, the editor will be able to request read access to the content URI
* contained in the {@link InputContentInfo} object.
*
* <p>Make sure that the content provider owning the Uri sets the
* {@link android.R.styleable#AndroidManifestProvider_grantUriPermissions
* grantUriPermissions} attribute in its manifest or included the
* {@link android.R.styleable#AndroidManifestGrantUriPermission
* &lt;grant-uri-permissions&gt;} tag. Otherwise
* {@link #commitContent(InputContentInfo, int, Bundle)} can fail.</p>
* &lt;grant-uri-permissions&gt;} tag. Otherwise {@link InputContentInfo#requestPermission()}
* can fail.</p>
*
* <p>Although calling this API is allowed only for the IME that is currently selected, the
* client is able to request a temporary read-only access even after the current IME is switched

16
core/java/android/view/inputmethod/InputContentInfo.java
View File

@@ -162,6 +162,22 @@ public final class InputContentInfo implements Parcelable {
mUriToken = token;
}
/**
* Requests a temporary read-only access permission for content URI associated with this object.
*
* <p>Does nothing if the temporary permission is already granted.</p>
*/
public void requestPermission() {
if (mUriToken == null) {
return;
}
try {
mUriToken.take();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
}
/**
* Releases a temporary read-only access permission for content URI associated with this object.
*

1
core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl
View File

@@ -22,5 +22,6 @@ import android.os.IBinder;
* {@hide}
*/
interface IInputContentUriToken {
void take();
void release();
}

10
core/java/com/android/internal/view/InputConnectionWrapper.java
View File

@@ -517,22 +517,20 @@ public class InputConnectionWrapper implements InputConnection {
public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
boolean result = false;
final boolean grantUriPermission =
(flags & InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0;
if (isMethodMissing(MissingMethodFlags.COMMIT_CONTENT)) {
// This method is not implemented.
return false;
}
try {
if (grantUriPermission) {
if ((flags & InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0) {
final AbstractInputMethodService inputMethodService = mInputMethodService.get();
if (inputMethodService == null) {
// This basically should not happen, because it's the the caller of this method.
return false;
}
// Temporarily grant URI permission.
inputMethodService.exposeContent(inputContentInfo, this);
}
InputContextCallback callback = InputContextCallback.getInstance();
mIInputContext.commitContent(inputContentInfo, flags, opts, callback.mSeq, callback);
synchronized (callback) {
@@ -542,10 +540,6 @@ public class InputConnectionWrapper implements InputConnection {
}
}
callback.dispose();
// If this request is not handled, then there is no reason to keep the URI permission.
if (grantUriPermission && !result) {
inputContentInfo.releasePermission();
}
} catch (RemoteException e) {
return false;
}

62
services/core/java/com/android/server/InputContentUriTokenHandler.java
View File

@@ -45,40 +45,48 @@ final class InputContentUriTokenHandler extends IInputContentUriToken.Stub {
@GuardedBy("mLock")
private IBinder mPermissionOwnerToken = null;
static InputContentUriTokenHandler create(@NonNull Uri contentUri, int sourceUid,
InputContentUriTokenHandler(@NonNull Uri contentUri, int sourceUid,
@NonNull String targetPackage, @UserIdInt int sourceUserId,
@UserIdInt int targetUserId) {
final IBinder permissionOwner;
try {
permissionOwner = ActivityManagerNative.getDefault()
.newUriPermissionOwner("InputContentUriTokenHandler");
} catch (RemoteException e) {
return null;
}
long origId = Binder.clearCallingIdentity();
try {
ActivityManagerNative.getDefault().grantUriPermissionFromOwner(
permissionOwner, sourceUserId, targetPackage, contentUri,
Intent.FLAG_GRANT_READ_URI_PERMISSION, sourceUserId, targetUserId);
} catch (RemoteException e) {
return null;
} finally {
Binder.restoreCallingIdentity(origId);
}
return new InputContentUriTokenHandler(contentUri, sourceUid, targetPackage, sourceUserId,
targetUserId, permissionOwner);
}
private InputContentUriTokenHandler(@NonNull Uri contentUri, int sourceUid,
@NonNull String targetPackage, @UserIdInt int sourceUserId,
@UserIdInt int targetUserId, @NonNull IBinder permissionOwnerToken) {
mUri = contentUri;
mSourceUid = sourceUid;
mTargetPackage = targetPackage;
mSourceUserId = sourceUserId;
mTargetUserId = targetUserId;
mPermissionOwnerToken = permissionOwnerToken;
}
@Override
public void take() {
synchronized (mLock) {
if (mPermissionOwnerToken != null) {
// Permission is already granted.
return;
}
try {
mPermissionOwnerToken = ActivityManagerNative.getDefault()
.newUriPermissionOwner("InputContentUriTokenHandler");
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
doTakeLocked(mPermissionOwnerToken);
}
}
private void doTakeLocked(@NonNull IBinder permissionOwner) {
long origId = Binder.clearCallingIdentity();
try {
try {
ActivityManagerNative.getDefault().grantUriPermissionFromOwner(
permissionOwner, mSourceUid, mTargetPackage, mUri,
Intent.FLAG_GRANT_READ_URI_PERMISSION, mSourceUserId, mTargetUserId);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
} finally {
Binder.restoreCallingIdentity(origId);
}
}
@Override

2
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -3953,7 +3953,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
final int imeUserId = UserHandle.getUserId(uid);
final int appUserId = UserHandle.getUserId(mCurClient.uid);
return InputContentUriTokenHandler.create(contentUri, uid, packageName, imeUserId,
return new InputContentUriTokenHandler(contentUri, uid, packageName, imeUserId,
appUserId);
}
}