diff options
| author | 2020-10-08 17:51:47 +0000 | |
|---|---|---|
| committer | 2020-10-08 17:51:47 +0000 | |
| commit | b854d53c994156d0ebdb04b89c787875cc28fbe1 (patch) | |
| tree | 610a9add7ff629f9241f3bab83acee24512d4b2c | |
| parent | ad08f4f0bd431fd1274115903ff4f944496a5538 (diff) | |
| parent | 4c55afd7872dada38932c819f2895234253db9d8 (diff) | |
Merge "Allow shell command to accept std input stream."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/UiAutomation.java | 4 | ||||
| -rw-r--r-- | non-updatable-api/current.txt | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 06cf21e7c3ca..7b48514bc5bb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6515,6 +6515,7 @@ package android.app { method public void dropShellPermissionIdentity(); method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException; method public android.os.ParcelFileDescriptor executeShellCommand(String); + method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRw(@NonNull String); method public android.view.accessibility.AccessibilityNodeInfo findFocus(int); method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow(); method public android.accessibilityservice.AccessibilityServiceInfo getServiceInfo(); diff --git a/api/test-current.txt b/api/test-current.txt index f117a7f332ed..a27268d44c24 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -539,7 +539,6 @@ package android.app { public final class UiAutomation { method public void destroy(); - method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRw(@NonNull String); method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRwe(@NonNull String); method @Deprecated public boolean grantRuntimePermission(String, String, android.os.UserHandle); method @Deprecated public boolean revokeRuntimePermission(String, String, android.os.UserHandle); diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index 4e868fe7370b..1b0fd9edf4f8 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -1242,10 +1242,8 @@ public final class UiAutomation { * * @param command The command to execute. * @return File descriptors (out, in) to the standard output/input streams. - * - * @hide */ - @TestApi + @SuppressLint("ArrayReturn") // For consistency with other APIs public @NonNull ParcelFileDescriptor[] executeShellCommandRw(@NonNull String command) { return executeShellCommandInternal(command, false /* includeStderr */); } diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 445b21284f95..3c591d50ddda 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -6515,6 +6515,7 @@ package android.app { method public void dropShellPermissionIdentity(); method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException; method public android.os.ParcelFileDescriptor executeShellCommand(String); + method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRw(@NonNull String); method public android.view.accessibility.AccessibilityNodeInfo findFocus(int); method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow(); method public android.accessibilityservice.AccessibilityServiceInfo getServiceInfo(); |