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

Commit 2415fa3e authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Expose variant of executeShellCommand which connects stderr"

parents be1ec60a 4d3aad72

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7279,6 +7279,7 @@ package android.app { 
    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 @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRwe(@NonNull String);

    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

    method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();

    method public android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ package android.app { 


  public final class UiAutomation {

    method public void destroy();

    method @NonNull public android.os.ParcelFileDescriptor[] executeShellCommandRwe(@NonNull String);

    method @NonNull public java.util.Set<java.lang.String> getAdoptedShellPermissions();

    method @Deprecated public boolean grantRuntimePermission(String, String, android.os.UserHandle);

    method public boolean injectInputEvent(@NonNull android.view.InputEvent, boolean, boolean);

core/java/android/app/UiAutomation.java

+0 −3
Original line number Diff line number Diff line
@@ -1447,10 +1447,7 @@ public final class UiAutomation { 
     *

     * @param command The command to execute.

     * @return File descriptors (out, in, err) to the standard output/input/error streams.

     *

     * @hide

     */

    @TestApi

    @SuppressLint("ArrayReturn") // For consistency with other APIs

    public @NonNull ParcelFileDescriptor[] executeShellCommandRwe(@NonNull String command) {

        return executeShellCommandInternal(command, true /* includeStderr */);