Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"

Browse Source 
* commit 'cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
  Frameworks/base: Remove unnecessary Pattern instance
This commit is contained in:
Andreas Gampe
2015-03-07 17:13:09 +00:00
committed by Android Git Automerger
parent 773bcfa7ec cdc19f3f8a
commit a3d5b2304c
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -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(