diff options
| author | 2016-02-19 04:03:49 +0000 | |
|---|---|---|
| committer | 2016-02-19 04:03:50 +0000 | |
| commit | 0f3431b616e03fe76cb52cabad209f95e1d7899c (patch) | |
| tree | 8dcd986eaf2f4b029a164db493a27e5c4baed228 | |
| parent | 2e5cdb5214af9c450ff1221fe4f313e2ee27c276 (diff) | |
| parent | f66381cd0df0aad41b7e4db9994483e44e0aaada (diff) | |
Merge "Improve requestPermissions API docs and throw correct exception." into nyc-dev
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/Fragment.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index e3adbda56bd4..332c73990f51 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4100,7 +4100,7 @@ public class Activity extends ContextThemeWrapper * } * </code></pre></p> * - * @param permissions The requested permissions. + * @param permissions The requested permissions. Must me non-null and not empty. * @param requestCode Application specific request code to match with a result * reported to {@link #onRequestPermissionsResult(int, String[], int[])}. * Should be >= 0. diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 8fcc54f88d6a..aafb3c638a65 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -1203,7 +1203,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene * } * </code></pre></p> * - * @param permissions The requested permissions. + * @param permissions The requested permissions. Must me non-null and not empty. * @param requestCode Application specific request code to match with a result * reported to {@link #onRequestPermissionsResult(int, String[], int[])}. * Should be >= 0. diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 0967608c11c3..188e1d7d92b0 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3175,7 +3175,7 @@ public abstract class PackageManager { */ public Intent buildRequestPermissionsIntent(@NonNull String[] permissions) { if (ArrayUtils.isEmpty(permissions)) { - throw new NullPointerException("permission cannot be null or empty"); + throw new IllegalArgumentException("permission cannot be null or empty"); } Intent intent = new Intent(ACTION_REQUEST_PERMISSIONS); intent.putExtra(EXTRA_REQUEST_PERMISSIONS_NAMES, permissions); |