diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-10 16:38:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 16:38:55 +0000 |
| commit | e6d8ffb40f555bbb3b88a3544616de28426e75a1 (patch) | |
| tree | 8e72e411fbb2f1ea14059bab1ea43a9dddac97f0 /core/java | |
| parent | f22030d1c59aca4f9ad2af7d4c4d646b0b619f27 (diff) | |
| parent | bbb912a89e92b389c7f9f4f7669a6b2836cb159a (diff) | |
Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Intent.java | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 25be96afe59b..519003754f17 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1576,13 +1576,17 @@ public class Intent implements Parcelable, Cloneable { * Broadcast action that requests current permission granted information. It will respond * to the request by sending a broadcast with action defined by * {@link #EXTRA_GET_PERMISSIONS_RESPONSE_INTENT}. The response will contain - * {@link #EXTRA_GET_PERMISSIONS_COUNT_RESULT} with contents described below or a null upon - * failure. + * {@link #EXTRA_GET_PERMISSIONS_COUNT_RESULT}, as well as + * {@link #EXTRA_GET_PERMISSIONS_GROUP_LIST_RESULT}, with contents described below or + * a null upon failure. * - * <p>If {@link #EXTRA_PACKAGE_NAME} is included then the number of permissions granted and the - * number of permissions requested by that package will be calculated and included as the first + * <p>If {@link #EXTRA_PACKAGE_NAME} is included then the number of permissions granted, the + * number of permissions requested and the number of granted additional permissions + * by that package will be calculated and included as the first * and second elements respectively of an int[] in the response as - * {@link #EXTRA_GET_PERMISSIONS_COUNT_RESULT}. + * {@link #EXTRA_GET_PERMISSIONS_COUNT_RESULT}. The response will also deliver the list + * of localized permission group names that are granted in + * {@link #EXTRA_GET_PERMISSIONS_GROUP_LIST_RESULT}. * * <p>If {@link #EXTRA_PACKAGE_NAME} is not included then the number of apps granted any runtime * permissions and the total number of apps requesting runtime permissions will be the first @@ -1602,7 +1606,14 @@ public class Intent implements Parcelable, Cloneable { = "android.intent.extra.GET_PERMISSIONS_COUNT_RESULT"; /** - * Required extra to be sent with {@link #ACTION_GET_PERMISSIONS_COUNT} broadcast. + * List of CharSequence of localized permission group labels. + * @hide + */ + public static final String EXTRA_GET_PERMISSIONS_GROUP_LIST_RESULT + = "android.intent.extra.GET_PERMISSIONS_GROUP_LIST_RESULT"; + + /** + * Required extra to be sent with {@link #ACTION_GET_PERMISSIONS_COUNT} broadcasts. * @hide */ public static final String EXTRA_GET_PERMISSIONS_RESPONSE_INTENT |