diff options
author | Andreas Gampe <agampe@google.com> | 2015-03-07 17:13:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-07 17:13:09 +0000 |
commit | a3d5b2304cf2db03ba728d37c87ef7360c7da44f (patch) | |
tree | ffdaf298d9edcb2210bbb82b7f6bf56eb9ffc324 /core/java/android | |
parent | 773bcfa7ecb1e06831e7f060ecc3c43d0cf1bf00 (diff) | |
parent | cdc19f3f8a20b975e8e70f4b4cce5ce2be811726 (diff) | |
download | frameworks_base-a3d5b2304cf2db03ba728d37c87ef7360c7da44f.zip frameworks_base-a3d5b2304cf2db03ba728d37c87ef7360c7da44f.tar.gz frameworks_base-a3d5b2304cf2db03ba728d37c87ef7360c7da44f.tar.bz2 |
am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit 'cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
Frameworks/base: Remove unnecessary Pattern instance
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index ccbed92..6ea9f7e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -124,7 +124,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.TimeZone; -import java.util.regex.Pattern; import libcore.io.DropBox; import libcore.io.EventLogger; @@ -163,7 +162,6 @@ public final class ActivityThread { private static final boolean DEBUG_MEMORY_TRIM = false; private static final boolean DEBUG_PROVIDER = false; private static final long MIN_TIME_BETWEEN_GCS = 5*1000; - private static final Pattern PATTERN_SEMICOLON = Pattern.compile(";"); private static final int SQLITE_MEM_RELEASED_EVENT_LOG_TAG = 75003; private static final int LOG_ON_PAUSE_CALLED = 30021; private static final int LOG_ON_RESUME_CALLED = 30022; @@ -4956,7 +4954,7 @@ public final class ActivityThread { private ProviderClientRecord installProviderAuthoritiesLocked(IContentProvider provider, ContentProvider localProvider, IActivityManager.ContentProviderHolder holder) { - final String auths[] = PATTERN_SEMICOLON.split(holder.info.authority); + final String auths[] = holder.info.authority.split(";"); final int userId = UserHandle.getUserId(holder.info.applicationInfo.uid); final ProviderClientRecord pcr = new ProviderClientRecord( |