Merge "Allow shell command to accept std input stream."

This commit is contained in:
Alex Buynytskyy
2020-10-08 17:51:47 +00:00
committed by Android (Google) Code Review
4 changed files with 3 additions and 4 deletions

View File

@@ -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();

View File

@@ -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);

View File

@@ -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 */);
}

View File

@@ -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();