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

Commit d7c30866 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

Merge "Update javadoc for adoptShellPermissionIdentity"

parents 01a8c813 07fe4828
Loading
Loading
Loading
Loading
+8 −8
Original line number Original line Diff line number Diff line
@@ -438,8 +438,8 @@ public final class UiAutomation {
     * Adopt the permission identity of the shell UID for all permissions. This allows
     * Adopt the permission identity of the shell UID for all permissions. This allows
     * you to call APIs protected permissions which normal apps cannot hold but are
     * you to call APIs protected permissions which normal apps cannot hold but are
     * granted to the shell UID. If you already adopted all shell permissions by calling
     * granted to the shell UID. If you already adopted all shell permissions by calling
     * this method or {@link #adoptShellPermissionIdentity(String...)} a subsequent call
     * this method or {@link #adoptShellPermissionIdentity(String...)} a subsequent call will
     * would be a no-op. Note that your permission state becomes that of the shell UID
     * replace any previous adoption. Note that your permission state becomes that of the shell UID
     * and it is not a combination of your and the shell UID permissions.
     * and it is not a combination of your and the shell UID permissions.
     * <p>
     * <p>
     * <strong>Note:<strong/> Calling this method adopts all shell permissions and overrides
     * <strong>Note:<strong/> Calling this method adopts all shell permissions and overrides
@@ -460,13 +460,13 @@ public final class UiAutomation {
    /**
    /**
     * Adopt the permission identity of the shell UID only for the provided permissions.
     * Adopt the permission identity of the shell UID only for the provided permissions.
     * This allows you to call APIs protected permissions which normal apps cannot hold
     * This allows you to call APIs protected permissions which normal apps cannot hold
     * but are granted to the shell UID. If you already adopted the specified shell
     * but are granted to the shell UID. If you already adopted shell permissions by calling
     * permissions by calling this method or {@link #adoptShellPermissionIdentity()} a
     * this method, or {@link #adoptShellPermissionIdentity()} a subsequent call will replace any
     * subsequent call would be a no-op. Note that your permission state becomes that of the
     * previous adoption.
     * shell UID and it is not a combination of your and the shell UID permissions.
     * <p>
     * <p>
     * <strong>Note:<strong/> Calling this method adopts only the specified shell permissions
     * <strong>Note:<strong/> This method behave differently from
     * and overrides all adopted permissions via {@link #adoptShellPermissionIdentity()}.
     * {@link #adoptShellPermissionIdentity()}. Only the listed permissions will use the shell
     * identity and other permissions will still check against the original UID
     *
     *
     * @param permissions The permissions to adopt or <code>null</code> to adopt all.
     * @param permissions The permissions to adopt or <code>null</code> to adopt all.
     *
     *