Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
This commit is contained in:
Phil Weaver
2016-05-17 17:36:17 +00:00
committed by android-build-merger
parent 85a3a71e5f 89d3ba72b7
commit bcaaac3ea1
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -5632,7 +5632,6 @@ package android.app {
public final class UiAutomation { public final class UiAutomation {
method public void clearWindowAnimationFrameStats(); method public void clearWindowAnimationFrameStats();
method public boolean clearWindowContentFrameStats(int); 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.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.os.ParcelFileDescriptor executeShellCommand(java.lang.String);
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int); method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

1
api/system-current.txt
View File

@@ -5779,7 +5779,6 @@ package android.app {
public final class UiAutomation { public final class UiAutomation {
method public void clearWindowAnimationFrameStats(); method public void clearWindowAnimationFrameStats();
method public boolean clearWindowContentFrameStats(int); 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.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.os.ParcelFileDescriptor executeShellCommand(java.lang.String);
method public android.view.accessibility.AccessibilityNodeInfo findFocus(int); method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

3
core/java/android/app/UiAutomation.java
View File

@@ -322,7 +322,10 @@ public final class UiAutomation {
/** /**
* Destroy this UiAutomation. After calling this method, attempting to use the object will * Destroy this UiAutomation. After calling this method, attempting to use the object will
* result in errors. * result in errors.
*
* @hide
*/ */
@TestApi
public void destroy() { public void destroy() {
disconnect(); disconnect();
mIsDestroyed = true; mIsDestroyed = true;