summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hufnagle <khufnagle@google.com>2021-01-11 18:56:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-01-11 18:56:59 +0000
commit05efe90a8d9ea55ec6c15faa4b41a12d58a51d2c (patch)
tree7e4b93428b39cd1948c52470c4b20a29899acb43
parent20b47da57ac2067429519c83f3053269195a38c8 (diff)
parentbd7aba8cbf44be345d087db80f15f73ef894a0f4 (diff)
downloadbase-05efe90a8d9ea55ec6c15faa4b41a12d58a51d2c.tar.gz
Merge "docs: Remove error in requestPermissions doc" into rvc-dev
-rw-r--r--core/java/android/app/Activity.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index e123af728b20..c976a9bfb30d 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5183,12 +5183,6 @@ public class Activity extends ContextThemeWrapper
* #checkSelfPermission(String)}.
* </p>
* <p>
- * Calling this API for permissions already granted to your app would show UI
- * to the user to decide whether the app can still hold these permissions. This
- * can be useful if the way your app uses data guarded by the permissions
- * changes significantly.
- * </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