Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35605148 authored Apr 24, 2017 by Abodunrinwa Toki Committed by android-build-merger Apr 24, 2017

Merge "Undeprecate WebView.findAddress am: 3f3354e0" into oc-dev-plus-aosp

am: 51848baf

Change-Id: I322ac2cc8d648b511f8276def7c0422157971d83

parents e498b995 51848baf

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -42739,7 +42739,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;
		@@ -48988,7 +48988,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<java.lang.String>);
		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);

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -46318,7 +46318,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;
		@@ -52664,7 +52664,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<java.lang.String>);
		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);

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -42954,7 +42954,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;
		@@ -49383,7 +49383,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<java.lang.String>);
		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);

core/java/android/text/util/Linkify.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -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;

		/**

core/java/android/webkit/WebView.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -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