Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad258082 authored by yuichiro fujiwara's avatar yuichiro fujiwara Committed by android-build-merger
Browse files

Merge "Fixes that Contacts crashes when invoke Action.EDIT with profile uri"... 

Merge "Fixes that Contacts crashes when invoke Action.EDIT with profile uri" am: a0788b81 am: 1cd5d118 am: b674ea3f
am: 3bff3de6

Change-Id: Ice319da3cbddfd9cdbcae8d7171fe328590384ad
parents 998d136f 3bff3de6

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

+2 −1
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ public class PickRawContactLoader extends 
        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;