diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/UiAutomation.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index db175427139c..dad21a04aa6b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6274,7 +6274,7 @@ package android.app { public final class UiAutomation { method public void adoptShellPermissionIdentity(); - method public void adoptShellPermissionIdentity(java.lang.String...); + method public void adoptShellPermissionIdentity(@Nullable java.lang.String...); method public void clearWindowAnimationFrameStats(); method public boolean clearWindowContentFrameStats(int); method public void dropShellPermissionIdentity(); diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index a021e3cb2d78..494467324581 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -22,6 +22,7 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.accessibilityservice.IAccessibilityServiceClient; import android.accessibilityservice.IAccessibilityServiceConnection; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.TestApi; import android.annotation.UnsupportedAppUsage; import android.graphics.Bitmap; @@ -390,10 +391,12 @@ public final class UiAutomation { * <strong>Note:<strong/> Calling this method adopts only the specified shell permissions * and overrides all adopted permissions via {@link #adoptShellPermissionIdentity()}. * + * @param permissions The permissions to adopt or <code>null</code> to adopt all. + * * @see #adoptShellPermissionIdentity() * @see #dropShellPermissionIdentity() */ - public void adoptShellPermissionIdentity(String... permissions) { + public void adoptShellPermissionIdentity(@Nullable String... permissions) { synchronized (mLock) { throwIfNotConnectedLocked(); } |