summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-08 00:08:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-08 00:08:19 +0000
commit208e80d931fd775de925529e0c36a34e9b7f916a (patch)
tree7ae5ff09cd16cd04e629ab7e21bd590aaa5dde13 /core/java/android/app/ActivityThread.java
parentea3d53f5a8f8e396bf8918041087db4603d444e5 (diff)
parenta3d5b2304cf2db03ba728d37c87ef7360c7da44f (diff)
downloadframeworks_base-208e80d931fd775de925529e0c36a34e9b7f916a.zip
frameworks_base-208e80d931fd775de925529e0c36a34e9b7f916a.tar.gz
frameworks_base-208e80d931fd775de925529e0c36a34e9b7f916a.tar.bz2
am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit 'a3d5b2304cf2db03ba728d37c87ef7360c7da44f': Frameworks/base: Remove unnecessary Pattern instance
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 61151ae..dda9952 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;
@@ -4953,7 +4951,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(