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

Merge "Handle exceptions from #requestPermission()" into nyc-mr1-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2016-10-15 00:31:19 +00:00
committed by Android (Google) Code Review
parent 289eac2319 93278ca144
commit eb7aad4d85
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,7 +580,13 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub {
return; return;
} }
if (grantUriPermission) { if (grantUriPermission) {
inputContentInfo.requestPermission(); try {
inputContentInfo.requestPermission();
} catch (Exception e) {
Log.e(TAG, "InputConnectionInfo.requestPermission() failed", e);
args.callback.setCommitContentResult(false, args.seq);
return;
}
} }
final boolean result = final boolean result =
ic.commitContent(inputContentInfo, flags, (Bundle) args.arg2); ic.commitContent(inputContentInfo, flags, (Bundle) args.arg2);