Merge "Fix getApplicationRestrictions documentation" into nyc-dev

This commit is contained in:
Esteban Talavera
2016-06-07 17:55:16 +00:00
committed by Android (Google) Code Review

View File

@@ -2021,7 +2021,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. * 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, * <p>The returned {@link Bundle} consists of key-value pairs, as defined by the application,
@@ -2034,8 +2034,8 @@ public class UserManager {
* </ul> * </ul>
* *
* @param packageName the package name of the calling application * @param packageName the package name of the calling application
* @return a {@code Bundle} with the restrictions for that package, or {@code null} if there * @return a {@link Bundle} with the restrictions for that package, or an empty {@link Bundle}
* are no saved restrictions. * if there are no saved restrictions.
* *
* @see #KEY_RESTRICTIONS_PENDING * @see #KEY_RESTRICTIONS_PENDING
*/ */