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

Commit 36e5feff authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Handle exceptions from #requestPermission() am: 93278ca1 

am: f8621ff5

Change-Id: I682e19b9f0657f840536b558204faf37872a7b36
parents 9f0aec42 f8621ff5

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

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

                        return;

                    }

                    }

                    if (grantUriPermission) {

                    if (grantUriPermission) {

                        try {

                            inputContentInfo.requestPermission();

                            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);