use user chosen country code to format and validate phone number for addresses.

chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.ProgressDialog;
 import android.os.Handler;
 import android.util.Pair;
 
@@ skipping 40 matching lines @@
     private boolean mAdminAreasLoaded;
     private String mRecentlySelectedCountry;
     private Runnable mCountryChangeCallback;
     private AutofillProfile mProfile;
     private EditorModel mEditor;
     private ProgressDialog mProgressDialog;
 
     /**
      * Adds the given phone number to the autocomplete set, if it's valid.
      *
-     * @param phoneNumber The phone number to possibly add.
+     * @param phoneNumber The phone number to possibly add, if it is not null or empty.
+     *                    We don't validate for number format since these are suggestions only.

[gogerald1, 2017/06/19 21:30:38]

The reason we do not validate it here is not because they are used for
suggestions only, but they are expected to have already been validated since we
are doing strict Autofill data validation.

And here is not validating 'number format' but 'number validity'. I would
comment like below:

/**
 * Adds the given phone number to the autocomplete set, if it's valid.
 * Note that here we consider all non-null and non-empty numbers as valid 
 * since we are doing strict validation of Autofill data.
 *
 * @param phoneNumber The phone number to possibly add.
 */

[wuandy1, 2017/06/20 15:33:26]

Done.

      */
     public void addPhoneNumberIfValid(@Nullable CharSequence phoneNumber) {
-        if (getPhoneValidator().isValid(phoneNumber)) mPhoneNumbers.add(phoneNumber);
+        if (phoneNumber != null && !phoneNumber.toString().isEmpty()) {

[gogerald1, 2017/06/19 21:30:38]

use TextUtils.isEmpty() which do both,
https://cs.chromium.org/chromium/src/third_party/android_tools/sdk/sources/an...

[wuandy1, 2017/06/20 15:33:27]

Done.

+            mPhoneNumbers.add(phoneNumber.toString());
+        }
     }
 
     /**
      * Builds and shows an editor model with the following fields.
      *
      * [ country dropdown   ] <----- country dropdown is always present.
      * [ an address field   ] \
      * [ an address field   ]  \
      *         ...               <-- field order, presence, required, and labels depend on country.
      * [ an address field   ]  /
@@ skipping 41 matching lines @@
              * If the selected country on the country dropdown list is changed,
              * the first element of eventData is the recently selected dropdown key,
              * the second element is the callback to invoke for when the dropdown
              * change has been processed.
              */
             @Override
             public void onResult(Pair<String, Runnable> eventData) {
                 mEditor.removeAllFields();
                 showProgressDialog();
                 mRecentlySelectedCountry = eventData.first;
+                mEditorDialog.updateCountryOfPhoneFormatter(mRecentlySelectedCountry);
                 mCountryChangeCallback = eventData.second;
                 loadAdminAreasForCountry(mRecentlySelectedCountry);
             }
         });
 
         // Country dropdown is cached, so the selected item needs to be updated for the new profile
         // that's being edited. This will not fire the dropdown callback.
         mCountryField.setValue(AutofillAddress.getCountryCode(mProfile));
+        mEditorDialog.updateCountryOfPhoneFormatter(mCountryField.getValue().toString());
 
         // There's a finite number of fields for address editing. Changing the country will re-order
         // and relabel the fields. The meaning of each field remains the same.
         if (mAddressFields.isEmpty()) {
             // City, dependent locality, and organization don't have any special formatting hints.
             mAddressFields.put(AddressField.LOCALITY, EditorFieldModel.createTextInput());
             mAddressFields.put(AddressField.DEPENDENT_LOCALITY, EditorFieldModel.createTextInput());
             mAddressFields.put(AddressField.ORGANIZATION, EditorFieldModel.createTextInput());
 
             // Sorting code and postal code (a.k.a. ZIP code) should show both letters and digits on
@@ skipping 10 matching lines @@
             // Android has special formatting rules for names.
             mAddressFields.put(AddressField.RECIPIENT, EditorFieldModel.createTextInput(
                     EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME));
         }
 
 
         // Phone number is present and required for all countries.
         if (mPhoneField == null) {
             mPhoneField = EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PHONE,
                     mContext.getString(R.string.autofill_profile_editor_phone_number),
-                    mPhoneNumbers, getPhoneValidator(), null,
+                    mPhoneNumbers, getPhoneValidator(mCountryField), null,
                     mContext.getString(R.string.payments_field_required_validation_message),
                     mContext.getString(R.string.payments_phone_invalid_validation_message), null);
         }
 
         // Phone number field is cached, so its value needs to be updated for every new profile
         // that's being edited.
         mPhoneField.setValue(mProfile.getPhoneNumber());
 
         // If the user clicks [Cancel], send |toEdit| address back to the caller, which was the
         // original state (could be null, a complete address, a partial address).
@@ skipping 208 matching lines @@
                         R.string.payments_field_required_validation_message));
             } else {
                 field.setRequiredErrorMessage(null);
             }
             mEditor.addField(field);
         }
         // Phone number must be the last field.
         mEditor.addField(mPhoneField);
     }
 
-    private EditorFieldValidator getPhoneValidator() {
+    private EditorFieldValidator getPhoneValidator(
+            @Nullable final EditorFieldModel countryCodeField) {

[gogerald1, 2017/06/19 21:30:38]

Why are you using EditorFieldModel instead of country code directly? Why it is
Nullable?

[wuandy1, 2017/06/20 15:33:26]

because validator can then run validation after user changed the value. it
should not be @nullable though.

         if (mPhoneValidator == null) {
             mPhoneValidator = new EditorFieldValidator() {
                 @Override
                 public boolean isValid(@Nullable CharSequence value) {
-                    return value != null && PhoneNumberUtil.isValidNumber(value.toString());
+                    String countryToValidateAgainst =
+                            (countryCodeField == null || countryCodeField.getValue() == null)
+                            ? null
+                            : countryCodeField.getValue().toString();
+                    return value != null
+                            && PhoneNumberUtil.isValidNumber(
+                                       value.toString(), countryToValidateAgainst);
                 }
 
                 @Override
                 public boolean isLengthMaximum(@Nullable CharSequence value) {
                     return false;
                 }
             };
         }
         return mPhoneValidator;
     }
 }