diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-16 23:51:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-16 23:51:53 +0000 |
| commit | 6f561a24c97d25a858cf98eef5c502ef8d80cfc1 (patch) | |
| tree | abde82390b8dddb05c4b12984adc351cd62b1f4d /core/java | |
| parent | 5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc (diff) | |
| parent | 0f45c7c7c40f2863560988a24bc06f395e12244d (diff) | |
| download | frameworks_base-6f561a24c97d25a858cf98eef5c502ef8d80cfc1.zip frameworks_base-6f561a24c97d25a858cf98eef5c502ef8d80cfc1.tar.gz frameworks_base-6f561a24c97d25a858cf98eef5c502ef8d80cfc1.tar.bz2 | |
Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 5 | ||||
| -rw-r--r-- | core/java/android/app/Fragment.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 96c7f84..e782fb8 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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. diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 66e2733..82206ea 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -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. |