Merge "Hide UiAutomation#destroy as test api." into nyc-dev

This commit is contained in:
Phil Weaver
2016-05-17 17:26:59 +00:00
committed by Android (Google) Code Review
3 changed files with 3 additions and 2 deletions

View File

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

View File

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

View File

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