commit 207b5e1722dc9349c694285d65a24955b630b54b
author Jonathan Dixon <joth@google.com> Thu Oct 11 15:44:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 11 15:44:17 2012 -0700
tree d18bcc86dae25f62416f57568b30cdcfbae92067
parent a58800d153f2a3db963ccbf9347eeccf855ed421
parent 402099f7861f306c2dd7c561bdc19b8f65d79b65

am 402099f7: Merge "Unhide setPictureListener" into jb-mr1-dev

* commit '402099f7861f306c2dd7c561bdc19b8f65d79b65':
  Unhide setPictureListener

api/17.txt

diff --git a/api/17.txt b/api/17.txt
index 7cadf9b..7b2f161 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -27448,6 +27448,7 @@
     method public void setInitialScale(int);
     method public deprecated void setMapTrackballToArrowKeys(boolean);
     method public void setNetworkAvailable(boolean);
+    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
     method public void setVerticalScrollbarOverlay(boolean);
     method public void setWebChromeClient(android.webkit.WebChromeClient);
     method public void setWebViewClient(android.webkit.WebViewClient);

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 3c2dd88..0e3d7a2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27467,6 +27467,7 @@
     method public void setInitialScale(int);
     method public deprecated void setMapTrackballToArrowKeys(boolean);
     method public void setNetworkAvailable(boolean);
+    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);
     method public void setVerticalScrollbarOverlay(boolean);
     method public void setWebChromeClient(android.webkit.WebChromeClient);
     method public void setWebViewClient(android.webkit.WebViewClient);

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 4202a7f..6df7820 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1480,7 +1480,6 @@
      *
      * @param listener an implementation of WebView.PictureListener
      * @deprecated This method is now obsolete.
-     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
      */
     @Deprecated
     public void setPictureListener(PictureListener listener) {