diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-06-02 22:09:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 22:09:18 +0000 |
| commit | 3aa3f5f892017f8a3799278c0cee8773dd4c5a0f (patch) | |
| tree | b32dc552c8bfa39b426bfe5f7da4371cca51a701 /core/java/android/app | |
| parent | c7a4eabe98226b9806753e8e6e2291b96fc8076a (diff) | |
| parent | aa048b6242585dfbf35ccefdaa59036ea2e47cf8 (diff) | |
| download | frameworks_base-3aa3f5f892017f8a3799278c0cee8773dd4c5a0f.zip frameworks_base-3aa3f5f892017f8a3799278c0cee8773dd4c5a0f.tar.gz frameworks_base-3aa3f5f892017f8a3799278c0cee8773dd4c5a0f.tar.bz2 | |
Merge "Fix java doc" into mnc-dev
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Activity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index a8eaaae..966482d 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -3746,7 +3746,7 @@ public class Activity extends ContextThemeWrapper * * @see #onRequestPermissionsResult(int, String[], int[]) * @see #checkSelfPermission(String) - * @see #canShowRequestPermissionRationale(String) + * @see #shouldShowRequestPermissionRationale(String) */ public final void requestPermissions(@NonNull String[] permissions, int requestCode) { Intent intent = getPackageManager().buildRequestPermissionsIntent(permissions); |