commit 49421dc19cf318205dc6d5a07442959b7d0032e2
author Kevin Hufnagle <khufnagle@google.com> Mon Jan 11 19:54:37 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 11 19:54:37 2021 +0000
tree e2d34898951578f0471eaab8a080cfce3763b25e
parent 6f45102db0815a93571de9e836adcd8e2466122d
parent 05efe90a8d9ea55ec6c15faa4b41a12d58a51d2c

Merge "docs: Remove error in requestPermissions doc" into rvc-dev am: 05efe90a8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13122154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3325b526d894701d199f2669131adb46dc1fca42

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index e123af7..c976a9b 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5183,12 +5183,6 @@
      * #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