Merge "Strip +1 when subscribing to VVM3" am: ed5b76a1

  }

  @WorkerThread

  @SuppressWarnings("missingPermission")

  public Vvm3Subscriber(

      ActivationTask task,

      PhoneAccountHandle handle,

    // Assuming getLine1Number() will work with VVM3. For unprovisioned users the IMAP username

    // is not included in the status SMS, thus no other way to get the current phone number.

    number =

        stripInternational(

            this.helper

                .getContext()

                .getSystemService(TelephonyManager.class)

                .createForPhoneAccountHandle(this.handle)

            .getLine1Number();

                .getLine1Number());

  }

  /**

   * Self provisioning gateway expects 10 digit national format, but {@link

   * TelephonyManager#getLine1Number()} might return e164 with "+1" at front.

   */

  private static String stripInternational(String number) {

    if (number.startsWith("+1")) {

      number = number.substring(2);

    }

    return number;

  }

  @WorkerThread