diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-27 02:09:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-27 02:09:42 +0000 |
| commit | add7d143419d8ada612eb3e0bb2807b0e97dff35 (patch) | |
| tree | b49fe3352268663ae05c447f0f088ccdc9df585b /java/com/android/dialer/calldetails/CallDetailsActivity.java | |
| parent | e5f1e62682bec9f7bfa019b1820328fe98fa45bf (diff) | |
| parent | 26f520249eccdcf2352806ba8d6a54bb8e5045a6 (diff) | |
Merge changes I4bdadacc,Ie1f8da1a
* changes:
Reworked the internals of DialerPhoneNumber.
Implemented Post Call in NUI.
Diffstat (limited to 'java/com/android/dialer/calldetails/CallDetailsActivity.java')
| -rw-r--r-- | java/com/android/dialer/calldetails/CallDetailsActivity.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index bf978ecf3..26b38ed82 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -40,7 +40,6 @@ import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.Toast; import com.android.dialer.CoalescedIds; -import com.android.dialer.DialerPhoneNumber; import com.android.dialer.assisteddialing.ui.AssistedDialingSettingActivity; import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry; import com.android.dialer.callintent.CallInitiationType; @@ -65,13 +64,14 @@ import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.logging.UiAction; import com.android.dialer.performancereport.PerformanceReport; -import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil; import com.android.dialer.postcall.PostCall; import com.android.dialer.precall.PreCall; import com.android.dialer.protos.ProtoParsers; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.lang.ref.WeakReference; import java.util.Collections; import java.util.List; @@ -441,10 +441,17 @@ public class CallDetailsActivity extends AppCompatActivity { @Override public Integer doInBackground(@NonNull String phoneNumber) { - DialerPhoneNumberUtil dialerPhoneNumberUtil = - new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance()); - DialerPhoneNumber parsedNumber = dialerPhoneNumberUtil.parse(phoneNumber, null); - return parsedNumber.getDialerInternalPhoneNumber().getCountryCode(); + PhoneNumber parsedNumber = null; + try { + parsedNumber = PhoneNumberUtil.getInstance().parse(phoneNumber, null); + } catch (NumberParseException e) { + LogUtil.w( + "AssistedDialingNumberParseWorker.doInBackground", + "couldn't parse phone number: " + LogUtil.sanitizePii(phoneNumber), + e); + return 0; + } + return parsedNumber.getCountryCode(); } } |