summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-08-24 07:30:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-24 07:30:11 -0700
commitd820c38d21c4c6f931785945a36cc82269f63694 (patch)
tree7665c1103292eefb32b7e8639e5348f6f0cd3eaa
parent58dc9b6bfa55d22ce145591ceab6bccd0f2b441f (diff)
parent513f68bc5a5f15d799f8795392d4861a5704fba1 (diff)
downloadframeworks_base-d820c38d21c4c6f931785945a36cc82269f63694.zip
frameworks_base-d820c38d21c4c6f931785945a36cc82269f63694.tar.gz
frameworks_base-d820c38d21c4c6f931785945a36cc82269f63694.tar.bz2
am 513f68bc: am bfe20d1a: am 8bfba7df: Merge "fix wrong substring"
* commit '513f68bc5a5f15d799f8795392d4861a5704fba1': fix wrong substring
-rwxr-xr-x[-rw-r--r--]core/java/android/provider/ContactsContract.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 0c16565..08621ea 100644..100755
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -8362,7 +8362,7 @@ public final class ContactsContract {
// Line contains the query string - now search for it at the start of tokens.
List<String> lineTokens = new ArrayList<String>();
List<Integer> tokenOffsets = new ArrayList<Integer>();
- split(contentLine.trim(), lineTokens, tokenOffsets);
+ split(contentLine, lineTokens, tokenOffsets);
// As we find matches against the query, we'll populate this list with the marked
// (or unchanged) tokens.