summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAhmad Melegy <ahmad.melegy@gmail.com>2017-11-17 18:55:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-17 18:55:53 +0000
commit8c7c6e3952724f092139100b0c88dae0eae03f07 (patch)
treeb17713e8ecc62d2dae5dbe9131391a9e2cbaff1e /core/java
parentaf657ae978d04445d15c66f82cac5eb420f7e616 (diff)
parent913f396c11fddc3113c1895763f8683f31e6bbb2 (diff)
Merge "Fix typo"
am: 913f396c11 Change-Id: I244ccafe5bf76718cdc48b2fa7d9ce8270b0dd33
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/Activity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 26f5ba130b7b..dbdb81c7c666 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -4387,7 +4387,7 @@ public class Activity extends ContextThemeWrapper
throw new IllegalArgumentException("requestCode should be >= 0");
}
if (mHasCurrentPermissionsRequest) {
- Log.w(TAG, "Can reqeust only one set of permissions at a time");
+ Log.w(TAG, "Can request only one set of permissions at a time");
// Dispatch the callback with empty arrays which means a cancellation.
onRequestPermissionsResult(requestCode, new String[0], new int[0]);
return;