Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb7aad4d authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

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

parents 289eac23 93278ca1

core/java/com/android/internal/view/IInputConnectionWrapper.java

+7 −1
Original line number Diff line number Diff line
@@ -580,7 +580,13 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { 
                        return;

                    }

                    if (grantUriPermission) {

                        try {

                            inputContentInfo.requestPermission();

                        } catch (Exception e) {

                            Log.e(TAG, "InputConnectionInfo.requestPermission() failed", e);

                            args.callback.setCommitContentResult(false, args.seq);

                            return;

                        }

                    }

                    final boolean result =

                            ic.commitContent(inputContentInfo, flags, (Bundle) args.arg2);