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

Commit 1d75ba1b authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of... 

am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit '69fd08a0':
  Improve documentation of onRequestPermissionsResult
parents 5e2b80bb 69fd08a0

core/java/android/app/Activity.java

+5 −0
Original line number Diff line number Diff line
@@ -3771,6 +3771,11 @@ public class Activity extends ContextThemeWrapper 
    /**

     * Callback for the result from requesting permissions. This method

     * is invoked for every call on {@link #requestPermissions(String[], int)}.

     * <p>

     * <strong>Note:</strong> It is possible that the permissions request interaction

     * with the user is interrupted. In this case you will receive empty permissions

     * and results arrays which should be treated as a cancellation.

     * </p>

     *

     * @param requestCode The request code passed in {@link #requestPermissions(String[], int)}.

     * @param permissions The requested permissions. Never null.

core/java/android/app/Fragment.java

+5 −0
Original line number Diff line number Diff line
@@ -1213,6 +1213,11 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    /**

     * Callback for the result from requesting permissions. This method

     * is invoked for every call on {@link #requestPermissions(String[], int)}.

     * <p>

     * <strong>Note:</strong> It is possible that the permissions request interaction

     * with the user is interrupted. In this case you will receive empty permissions

     * and results arrays which should be treated as a cancellation.

     * </p>

     *

     * @param requestCode The request code passed in {@link #requestPermissions(String[], int)}.

     * @param permissions The requested permissions. Never null.