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

Commit a0788b81 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 3ba72351 42668561

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -179,7 +179,8 @@ public class PickRawContactLoader extends 
        if (uri == null) {

        if (uri == null) {

            throw new IllegalArgumentException("Uri must not be 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);

            throw new IllegalArgumentException("Invalid contact Uri: " + uri);

        }

        }

        return uri;

        return uri;