commit 2321967884d9bb21b17dc6ea7fb3f368de0a40ce
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 17 20:36:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 17 20:36:45 2017 +0000
tree 33aceb8682e4a436984f958ffdb28b05751b2587
parent a0788b810916120ff290f448e906e3c4dafe0494
parent 7485a6bb995625e377ccb38c5d242b135b4803db

Merge "Fixed that wrong SIM phone number is displayed when setting RTL language"

src/com/android/contacts/editor/PickRawContactLoader.java

diff --git a/src/com/android/contacts/editor/PickRawContactLoader.java b/src/com/android/contacts/editor/PickRawContactLoader.java
index e43d02b..772bc16 100644
--- a/src/com/android/contacts/editor/PickRawContactLoader.java
+++ b/src/com/android/contacts/editor/PickRawContactLoader.java
@@ -179,7 +179,8 @@
         if (uri == null) {
             throw new IllegalArgumentException("Uri must not be null");
         }
-        if (!uri.toString().startsWith(Contacts.CONTENT_URI.toString())) {
+        if (!uri.toString().startsWith(Contacts.CONTENT_URI.toString()) &&
+                !uri.toString().equals(Profile.CONTENT_URI.toString())) {
             throw new IllegalArgumentException("Invalid contact Uri: " + uri);
         }
         return uri;