From e6269c3f1d93582f0bcc18e37227ed4eec001a17 Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Mon, 16 May 2016 12:55:08 -0700
Subject: [PATCH] Hide UiAutomation#destroy as test api.

Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
---
 api/current.txt                         | 1 -
 api/system-current.txt                  | 1 -
 core/java/android/app/UiAutomation.java | 3 +++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index e9d5c3df9318..d8fc66c3080d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5624,7 +5624,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);
diff --git a/api/system-current.txt b/api/system-current.txt
index e5c88cca2b84..45aa1d590c23 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5771,7 +5771,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);
diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java
index 5ec59b467510..0d4d007f46f9 100644
--- a/core/java/android/app/UiAutomation.java
+++ b/core/java/android/app/UiAutomation.java
@@ -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;
-- 
2.11.0