diff options
| author | Esteban Talavera <etalavera@google.com> | 2016-06-07 17:59:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 17:59:01 +0000 |
| commit | cc12064670c9e0ade3ffcb4ff2eed4ddd5d267a8 (patch) | |
| tree | 8d5fcc940fa2e2dde5497cfac4424af571407bdb /core/java/android/os | |
| parent | 779adf8879f94ffa97d0f889f1376c5bb3929ef4 (diff) | |
| parent | a86d6c4df3b193060b4b725e1abfed4f69689843 (diff) | |
Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am: a86d6c4df3
* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
Fix getApplicationRestrictions documentation
Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 4b0cb09f5d9f..9b0ef8e1fde4 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2045,7 +2045,7 @@ public class UserManager { } /** - * Returns a {@code Bundle} containing any saved application restrictions for this user, for the + * Returns a {@link Bundle} containing any saved application restrictions for this user, for the * given package name. Only an application with this package name can call this method. * * <p>The returned {@link Bundle} consists of key-value pairs, as defined by the application, @@ -2058,8 +2058,8 @@ public class UserManager { * </ul> * * @param packageName the package name of the calling application - * @return a {@code Bundle} with the restrictions for that package, or {@code null} if there - * are no saved restrictions. + * @return a {@link Bundle} with the restrictions for that package, or an empty {@link Bundle} + * if there are no saved restrictions. * * @see #KEY_RESTRICTIONS_PENDING */ |