diff options
| author | vichang <vichang@google.com> | 2021-01-05 22:18:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-05 22:18:48 +0000 |
| commit | 4eb4e375f7cbf3881173221c00a7399a1a79e7b9 (patch) | |
| tree | 28c0b6c4d0155316a5d0fa24671fa6598b32aaec /core/java/android | |
| parent | cc7c94c433f48c1236621033ef2c53832c6b7107 (diff) | |
| parent | 97006e6b51b7838eb2b0285da9decdc6d03d9d2d (diff) | |
Merge "Deprecate Patterns.IP_ADDRESS"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/Patterns.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/util/Patterns.java b/core/java/android/util/Patterns.java index 7ad16ff3dc23..ece069fa0873 100644 --- a/core/java/android/util/Patterns.java +++ b/core/java/android/util/Patterns.java @@ -248,6 +248,13 @@ public class Patterns { + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]" + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}" + "|[1-9][0-9]|[0-9]))"; + + /** + * Kept for backward compatibility reasons. It does not match IPv6 addresses. + * + * @deprecated Please use {@link android.net.InetAddresses#isNumericAddress(String)} instead. + */ + @Deprecated public static final Pattern IP_ADDRESS = Pattern.compile(IP_ADDRESS_STRING); /** |