commit cdd1d6c8f7447caa964fd10c39d1f00f103e5606
author Jay Shrauner <shrauner@google.com> Mon Dec 08 20:31:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 08 20:31:03 2014 +0000
tree 49141c1ebd18897c0071ec99b5381193e1d20c6e
parent 07685ea823d125c2626e52087afa7812e5300f7e
parent e5ef2f7588349b7121d79a11055ceb4b7e9810f2

Merge "Fix package manager TransactionTooLargeExceptions" into lmp-mr1-dev

src/com/android/contacts/common/model/ContactLoader.java

diff --git a/src/com/android/contacts/common/model/ContactLoader.java b/src/com/android/contacts/common/model/ContactLoader.java
index 998fb2d..59ab292 100644
--- a/src/com/android/contacts/common/model/ContactLoader.java
+++ b/src/com/android/contacts/common/model/ContactLoader.java
@@ -318,7 +318,7 @@
                 resultIsCached = true;
             } else {
                 if (uriCurrentFormat.getLastPathSegment().equals(Constants.LOOKUP_URI_ENCODED)) {
-                    result = loadEncodedContactEntity(uriCurrentFormat);
+                    result = loadEncodedContactEntity(uriCurrentFormat, mLookupUri);
                 } else {
                     result = loadContactEntity(resolver, uriCurrentFormat);
                 }
@@ -351,7 +351,22 @@
         }
     }
 
-    private Contact loadEncodedContactEntity(Uri uri) throws JSONException {
+    /**
+     * Parses a {@link Contact} stored as a JSON string in a lookup URI.
+     *
+     * @param lookupUri The contact information to parse .
+     * @return The parsed {@code Contact} information.
+     * @throws JSONException
+     */
+    public static Contact parseEncodedContactEntity(Uri lookupUri)  {
+        try {
+            return loadEncodedContactEntity(lookupUri, lookupUri);
+        } catch (JSONException je) {
+            return null;
+        }
+    }
+
+    private static Contact loadEncodedContactEntity(Uri uri, Uri lookupUri) throws JSONException {
         final String jsonString = uri.getEncodedFragment();
         final JSONObject json = new JSONObject(jsonString);
 
@@ -365,7 +380,7 @@
         final String photoUri = json.optString(Contacts.PHOTO_URI, null);
         final Contact contact = new Contact(
                 uri, uri,
-                mLookupUri,
+                lookupUri,
                 directoryId,
                 null /* lookupKey */,
                 -1 /* id */,
@@ -425,7 +440,7 @@
         return contact;
     }
 
-    private void processOneRecord(RawContact rawContact, JSONObject item, String mimetype)
+    private static void processOneRecord(RawContact rawContact, JSONObject item, String mimetype)
             throws JSONException {
         final ContentValues itemValues = new ContentValues();
         itemValues.put(Data.MIMETYPE, mimetype);

src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java

diff --git a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
index 86db174..0870254 100644
--- a/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
@@ -26,6 +26,7 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.telecom.TelecomManager;
+import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -194,7 +195,9 @@
                 holder.numberTextView.setVisibility(View.GONE);
             } else {
                 holder.numberTextView.setVisibility(View.VISIBLE);
-                holder.numberTextView.setText(account.getAddress().getSchemeSpecificPart());
+                holder.numberTextView.setText(
+                        PhoneNumberUtils.ttsSpanAsPhoneNumber(
+                                account.getAddress().getSchemeSpecificPart()));
             }
             holder.imageView.setImageDrawable(account.createIconDrawable(getContext()));
             return rowView;