From 3f3354e087d3b0df568f53faef1d5bdf800d3be6 Mon Sep 17 00:00:00 2001 From: Abodunrinwa Toki Date: Fri, 21 Apr 2017 17:54:38 +0100 Subject: [PATCH] Undeprecate WebView.findAddress Reverts I772961bd20bff4817a060f14a843abeceb55ac92 Until we bring back TextClassifier.getLinks See I275a9d055ef0ab68f3ca339c37ee939257c4bd54 Test: none Bug: 22362008 Bug: 37565246 Change-Id: I2948f22cf4c3462491f47376af48624697703969 --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- core/java/android/text/util/Linkify.java | 4 ---- core/java/android/webkit/WebView.java | 7 ------- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/api/current.txt b/api/current.txt index 0575887837f42..b1ff0ddb01de3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -42735,7 +42735,7 @@ package android.text.util { method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); field public static final int ALL = 15; // 0xf field public static final int EMAIL_ADDRESSES = 2; // 0x2 - field public static final deprecated int MAP_ADDRESSES = 8; // 0x8 + field public static final int MAP_ADDRESSES = 8; // 0x8 field public static final int PHONE_NUMBERS = 4; // 0x4 field public static final int WEB_URLS = 1; // 0x1 field public static final android.text.util.Linkify.MatchFilter sPhoneNumberMatchFilter; @@ -48975,7 +48975,7 @@ package android.webkit { method public void documentHasImages(android.os.Message); method public static void enableSlowWholeDocumentDraw(); method public void evaluateJavascript(java.lang.String, android.webkit.ValueCallback); - method public static deprecated java.lang.String findAddress(java.lang.String); + method public static java.lang.String findAddress(java.lang.String); method public deprecated int findAll(java.lang.String); method public void findAllAsync(java.lang.String); method public void findNext(boolean); diff --git a/api/system-current.txt b/api/system-current.txt index a031cc0c72ab6..8a4b335f89c70 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -46312,7 +46312,7 @@ package android.text.util { method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); field public static final int ALL = 15; // 0xf field public static final int EMAIL_ADDRESSES = 2; // 0x2 - field public static final deprecated int MAP_ADDRESSES = 8; // 0x8 + field public static final int MAP_ADDRESSES = 8; // 0x8 field public static final int PHONE_NUMBERS = 4; // 0x4 field public static final int WEB_URLS = 1; // 0x1 field public static final android.text.util.Linkify.MatchFilter sPhoneNumberMatchFilter; @@ -52649,7 +52649,7 @@ package android.webkit { method public void documentHasImages(android.os.Message); method public static void enableSlowWholeDocumentDraw(); method public void evaluateJavascript(java.lang.String, android.webkit.ValueCallback); - method public static deprecated java.lang.String findAddress(java.lang.String); + method public static java.lang.String findAddress(java.lang.String); method public deprecated int findAll(java.lang.String); method public void findAllAsync(java.lang.String); method public void findNext(boolean); diff --git a/api/test-current.txt b/api/test-current.txt index 90e0ad37c938b..e784e72d9c9af 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -42934,7 +42934,7 @@ package android.text.util { method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); field public static final int ALL = 15; // 0xf field public static final int EMAIL_ADDRESSES = 2; // 0x2 - field public static final deprecated int MAP_ADDRESSES = 8; // 0x8 + field public static final int MAP_ADDRESSES = 8; // 0x8 field public static final int PHONE_NUMBERS = 4; // 0x4 field public static final int WEB_URLS = 1; // 0x1 field public static final android.text.util.Linkify.MatchFilter sPhoneNumberMatchFilter; @@ -49354,7 +49354,7 @@ package android.webkit { method public void documentHasImages(android.os.Message); method public static void enableSlowWholeDocumentDraw(); method public void evaluateJavascript(java.lang.String, android.webkit.ValueCallback); - method public static deprecated java.lang.String findAddress(java.lang.String); + method public static java.lang.String findAddress(java.lang.String); method public deprecated int findAll(java.lang.String); method public void findAllAsync(java.lang.String); method public void findNext(boolean); diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index 0f8515988d1e2..7e6eb4906c205 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -88,11 +88,7 @@ public class Linkify { * {@link android.webkit.WebView#findAddress(String) findAddress()} method in * {@link android.webkit.WebView} for finding addresses, which has various * limitations. - * - * @deprecated See {@link android.webkit.WebView#findAddress(String) findAddress()} - * for more explanation. */ - @Deprecated public static final int MAP_ADDRESSES = 0x08; /** diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 9202889ac9f22..6213a63e108a5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1731,14 +1731,7 @@ public class WebView extends AbsoluteLayout * * @param addr the string to search for addresses * @return the address, or if no address is found, null - * - * @deprecated findAddress is deprecated. It only supports a subset of US - * addresses and has a high false positive rate. Calling findAddress also causes - * WebView to be loaded into the app, which significantly increases memory usage - * if the app doesn't already use WebView. Use {@link TextClassifier} instead for - * classifying text and finding addresses. */ - @Deprecated public static String findAddress(String addr) { // TODO: Rewrite this in Java so it is not needed to start up chromium // Could also be deprecated