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

Merge "Automatically grant URI permission as needed." into nyc-mr1-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2016-07-01 01:09:54 +00:00
committed by Android (Google) Code Review
parent 9ecf5010d3 f3806f57a5
commit d2e046a720
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,8 +191,6 @@ public final class InputContentInfo implements Parcelable {
mUriToken.release();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
} finally {
mUriToken = null;
}
}

16
core/java/com/android/internal/view/IInputConnectionWrapper.java
View File

@@ -562,6 +562,8 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub {
}
case DO_COMMIT_CONTENT: {
final int flags = msg.arg1;
final boolean grantUriPermission =
(flags & InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION) != 0;
SomeArgs args = (SomeArgs) msg.obj;
try {
InputConnection ic = getInputConnection();
@@ -577,9 +579,17 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub {
args.callback.setCommitContentResult(false, args.seq);
return;
}
args.callback.setCommitContentResult(
ic.commitContent(inputContentInfo, flags, (Bundle) args.arg2),
args.seq);
if (grantUriPermission) {
inputContentInfo.requestPermission();
}
final boolean result =
ic.commitContent(inputContentInfo, flags, (Bundle) args.arg2);
// If this request is not handled, then there is no reason to keep the URI
// permission.
if (grantUriPermission && !result) {
inputContentInfo.releasePermission();
}
args.callback.setCommitContentResult(result, args.seq);
} catch (RemoteException e) {
Log.w(TAG, "Got RemoteException calling commitContent", e);
}