Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix getApplicationRestrictions documentation" into nyc-dev

Browse Source 
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
This commit is contained in:
Esteban Talavera
2016-06-07 17:59:01 +00:00
committed by android-build-merger
parent 779adf8879 a86d6c4df3
commit cc12064670
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/UserManager.java
View File

@@ -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
*/