commit 95743a4c2091fb633a772e705f8809530543bd16
author Phil Weaver <pweaver@google.com> Thu Aug 09 23:14:56 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 09 23:14:56 2018 +0000
tree d970207ea0cfb3dde181894c625939646e5fdf4a
parent 2ac27ae4d05706b4058e937e38d721a1f671a8cd
parent 91ecb31e8fd35e4a0756b9ac52923daf87e00eea

Merge "Unhide View#getAccessibilityDelegate"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 897a8d9..c38d837 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -47620,6 +47620,7 @@
     method public void forceLayout();
     method public static int generateViewId();
     method public java.lang.CharSequence getAccessibilityClassName();
+    method public android.view.View.AccessibilityDelegate getAccessibilityDelegate();
     method public int getAccessibilityLiveRegion();
     method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider();
     method public java.lang.CharSequence getAccessibilityPaneTitle();

config/hiddenapi-light-greylist.txt

diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index 4f60b0c..0b55877 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -5233,7 +5233,6 @@
 Landroid/view/View;->findViewByAccessibilityId(I)Landroid/view/View;
 Landroid/view/View;->fitsSystemWindows()Z
 Landroid/view/View;->gatherTransparentRegion(Landroid/graphics/Region;)Z
-Landroid/view/View;->getAccessibilityDelegate()Landroid/view/View$AccessibilityDelegate;
 Landroid/view/View;->getAccessibilityViewId()I
 Landroid/view/View;->getBoundsOnScreen(Landroid/graphics/Rect;)V
 Landroid/view/View;->getBoundsOnScreen(Landroid/graphics/Rect;Z)V

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index e2e2b00..65ab3ac 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9008,8 +9008,6 @@
      * composition. For more details see {@link AccessibilityDelegate}.
      *
      * @return The delegate, or null if none set.
-     *
-     * @hide
      */
     public AccessibilityDelegate getAccessibilityDelegate() {
         return mAccessibilityDelegate;