From 055678b5fe8f892ca64a384e839564b6de4d89cc Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 6 Mar 2015 15:53:06 -0800 Subject: [PATCH] Frameworks/base: Remove unnecessary Pattern instance Using a static Pattern in UriMatcher prevents compile-time initialization. It is also not efficient, as String.split has a fast path for simple splits. Bug: 19542228 Change-Id: Ie9e5bfe6da04c6d05ec10b1426d0cd136ef46ef2 --- core/java/android/content/UriMatcher.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/java/android/content/UriMatcher.java b/core/java/android/content/UriMatcher.java index 8487dae4f7bf5..71a035e47f199 100644 --- a/core/java/android/content/UriMatcher.java +++ b/core/java/android/content/UriMatcher.java @@ -20,7 +20,6 @@ import android.net.Uri; import java.util.ArrayList; import java.util.List; -import java.util.regex.Pattern; /** Utility class to aid in matching URIs in content providers. @@ -171,7 +170,7 @@ public class UriMatcher if (path.length() > 0 && path.charAt(0) == '/') { newPath = path.substring(1); } - tokens = PATH_SPLIT_PATTERN.split(newPath); + tokens = newPath.split("/"); } int numTokens = tokens != null ? tokens.length : 0; @@ -207,8 +206,6 @@ public class UriMatcher node.mCode = code; } - static final Pattern PATH_SPLIT_PATTERN = Pattern.compile("/"); - /** * Try to match against the path in a url. *