From 0f45c7c7c40f2863560988a24bc06f395e12244d Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Thu, 16 Jul 2015 16:28:51 -0700
Subject: [PATCH] Improve documentation of onRequestPermissionsResult

bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
---
 core/java/android/app/Activity.java | 5 +++++
 core/java/android/app/Fragment.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 7572799108a1..e66da47b3267 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 66e2733d6294..82206ea998ea 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.
-- 
2.11.0