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

Commit 3070a2a9 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72 

am: 11ece947

* commit '11ece947':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
parents aead9dbc 11ece947

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5632,7 +5632,6 @@ package android.app { 
  public final class UiAutomation {

    method public void clearWindowAnimationFrameStats();

    method public boolean clearWindowContentFrameStats(int);

    method public void destroy();

    method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;

    method public android.os.ParcelFileDescriptor executeShellCommand(java.lang.String);

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

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5779,7 +5779,6 @@ package android.app { 
  public final class UiAutomation {

    method public void clearWindowAnimationFrameStats();

    method public boolean clearWindowContentFrameStats(int);

    method public void destroy();

    method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(java.lang.Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;

    method public android.os.ParcelFileDescriptor executeShellCommand(java.lang.String);

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

core/java/android/app/UiAutomation.java

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

     * Destroy this UiAutomation. After calling this method, attempting to use the object will

     * result in errors.

     *

     * @hide

     */

    @TestApi

    public void destroy() {

        disconnect();

        mIsDestroyed = true;