Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ff488b authored by Esteban Talavera's avatar Esteban Talavera Committed by android-build-merger
Browse files

Merge "Fix getApplicationRestrictions documentation" into nyc-dev 

am: a86d6c4d

* commit 'a86d6c4d':
  Fix getApplicationRestrictions documentation

Change-Id: Idaab3c8f765d5e5631aa69557a9c3f194c9d5d33
parents 7aa88881 a86d6c4d

core/java/android/os/UserManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -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

     */

     */