commit 08e2e5137cff65b6d1728627213f992922bea0a7
author mariagpuyol <mariagpuyol@google.com> Wed Mar 08 10:00:15 2017 -0800
committer mariagpuyol <mariagpuyol@google.com> Thu Mar 09 17:12:46 2017 -0800
tree d9c36652d34476898893dec5569a1348d0d42081
parent 348b0474d9cba29a4bd426220f2014e6e7599bcb

Protect against IllegalArgumentExceptions when reading contacts.
Also rename contactUri to phoneUri.
Bug:35873712
Test: runtest --path packages/apps/EmergencyInfo/tests/src/com/android/emergency/

Change-Id: I667ac74caf027b19aeeac94bb563c3a6b1cbb416

src/com/android/emergency/preferences/ContactPreference.java

diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index e50e450..8cdb057 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -72,26 +72,25 @@
      * Instantiates a ContactPreference that displays an emergency contact, taking in a Context and
      * the Uri.
      */
-    public ContactPreference(Context context, @NonNull Uri contactUri) {
+    public ContactPreference(Context context, @NonNull Uri phoneUri) {
         super(context);
         setOrder(DEFAULT_ORDER);
 
-        setUri(contactUri);
+        setPhoneUri(phoneUri);
 
         setWidgetLayoutResource(R.layout.preference_user_delete_widget);
         setPersistent(false);
     }
 
-    public void setUri(@NonNull Uri contactUri) {
-        if (mContact != null && !contactUri.equals(mContact.getContactUri()) &&
+    public void setPhoneUri(@NonNull Uri phoneUri) {
+        if (mContact != null && !phoneUri.equals(mContact.getPhoneUri()) &&
                 mRemoveContactDialog != null) {
             mRemoveContactDialog.dismiss();
         }
-
-        mContact = EmergencyContactManager.getContact(getContext(), contactUri);
+        mContact = EmergencyContactManager.getContact(getContext(), phoneUri);
 
         setTitle(mContact.getName());
-        setKey(mContact.getContactUri().toString());
+        setKey(mContact.getPhoneUri().toString());
         String summary = mContact.getPhoneType() == null ?
                 mContact.getPhoneNumber() :
                 String.format(
@@ -166,8 +165,8 @@
         }
     }
 
-    public Uri getContactUri() {
-        return mContact.getContactUri();
+    public Uri getPhoneUri() {
+        return mContact.getPhoneUri();
     }
 
     @VisibleForTesting