Merge "Update javadoc for adoptShellPermissionIdentity"
This commit is contained in:
committed by
Android (Google) Code Review
commit
d7c308666a
@@ -438,8 +438,8 @@ public final class UiAutomation {
|
||||
* 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
|
||||
* granted to the shell UID. If you already adopted all shell permissions by calling
|
||||
* this method or {@link #adoptShellPermissionIdentity(String...)} a subsequent call
|
||||
* would be a no-op. Note that your permission state becomes that of the shell UID
|
||||
* this method or {@link #adoptShellPermissionIdentity(String...)} a subsequent call will
|
||||
* 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.
|
||||
* <p>
|
||||
* <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.
|
||||
* 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
|
||||
* permissions by calling this method or {@link #adoptShellPermissionIdentity()} a
|
||||
* subsequent call would be a no-op. Note that your permission state becomes that of the
|
||||
* shell UID and it is not a combination of your and the shell UID permissions.
|
||||
* but are granted to the shell UID. If you already adopted shell permissions by calling
|
||||
* this method, or {@link #adoptShellPermissionIdentity()} a subsequent call will replace any
|
||||
* previous adoption.
|
||||
* <p>
|
||||
* <strong>Note:<strong/> Calling this method adopts only the specified shell permissions
|
||||
* and overrides all adopted permissions via {@link #adoptShellPermissionIdentity()}.
|
||||
* <strong>Note:<strong/> This method behave differently from
|
||||
* {@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.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user