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

Commit 018733d6 authored by Svet Ganov's avatar Svet Ganov Committed by Android Git Automerger
Browse files

am e8b8d30a: am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 

* commit 'e8b8d30a':
  Improve request permission docs
parents 9c4531e0 e8b8d30a

core/java/android/app/Activity.java

+7 −0
Original line number Diff line number Diff line
@@ -3723,6 +3723,12 @@ public class Activity extends ContextThemeWrapper 
     * #checkSelfPermission(String)}.

     * </p>

     * <p>

     * You cannot request a permission if your activity sets {@link

     * android.R.styleable#AndroidManifestActivity_noHistory noHistory} to

     * <code>true</code> because in this case the activity would not receive

     * result callbacks including {@link #onRequestPermissionsResult(int, String[], int[])}.

     * </p>

     * <p>

     * A sample permissions request looks like this:

     * </p>

     * <code><pre><p>
@@ -3749,6 +3755,7 @@ public class Activity extends ContextThemeWrapper 
     * @param permissions The requested permissions.

     * @param requestCode Application specific request code to match with a result

     *    reported to {@link #onRequestPermissionsResult(int, String[], int[])}.

     *    Should be >= 0.

     *

     * @see #onRequestPermissionsResult(int, String[], int[])

     * @see #checkSelfPermission(String)

core/java/android/app/Fragment.java

+7 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,12 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
     * android.content.Context#checkSelfPermission(String)}.

     * </p>

     * <p>

     * You cannot request a permission if your activity sets {@link

     * android.R.styleable#AndroidManifestActivity_noHistory noHistory} to

     * <code>true</code> because in this case the activity would not receive

     * result callbacks including {@link #onRequestPermissionsResult(int, String[], int[])}.

     * </p>

     * <p>

     * A sample permissions request looks like this:

     * </p>

     * <code><pre><p>
@@ -1192,6 +1198,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
     * @param permissions The requested permissions.

     * @param requestCode Application specific request code to match with a result

     *    reported to {@link #onRequestPermissionsResult(int, String[], int[])}.

     *    Should be >= 0.

     *

     * @see #onRequestPermissionsResult(int, String[], int[])

     * @see android.content.Context#checkSelfPermission(String)