Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7135762 authored by Shaopeng Jia's avatar Shaopeng Jia
Browse files

Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers 

to avoid name collision.

Bug: 5157607
Change-Id: Ic397f371e381a71f17b0b70b955e89d08f7a9867
parent ba86443e

preloaded-classes

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ com.google.android.gles_jni.EGLDisplayImpl 
com.google.android.gles_jni.EGLImpl

com.google.android.gles_jni.EGLSurfaceImpl

com.google.android.gles_jni.GLImpl

com.google.i18n.phonenumbers.PhoneNumberUtil

com.android.i18n.phonenumbers.PhoneNumberUtil

dalvik.system.BlockGuard

dalvik.system.BlockGuard$1

dalvik.system.BlockGuard$2

telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package android.telephony;



import com.google.i18n.phonenumbers.AsYouTypeFormatter;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

import com.android.i18n.phonenumbers.AsYouTypeFormatter;

import com.android.i18n.phonenumbers.PhoneNumberUtil;



import android.telephony.PhoneNumberUtils;

import android.text.Editable;

telephony/java/android/telephony/PhoneNumberUtils.java

+4 −4
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package android.telephony;



import com.google.i18n.phonenumbers.NumberParseException;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;

import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;

import com.android.i18n.phonenumbers.NumberParseException;

import com.android.i18n.phonenumbers.PhoneNumberUtil;

import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;

import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;



import android.content.Context;

import android.content.Intent;

telephony/java/com/android/internal/telephony/CallerInfo.java

+5 −5
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.Log;



import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;

import com.google.i18n.phonenumbers.NumberParseException;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;

import com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder;

import com.android.i18n.phonenumbers.NumberParseException;

import com.android.i18n.phonenumbers.PhoneNumberUtil;

import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;



import java.util.Locale;
@@ -502,7 +502,7 @@ public class CallerInfo { 


    /**

     * @return a geographical description string for the specified number.

     * @see com.google.i18n.phonenumbers.PhoneNumberOfflineGeocoder

     * @see com.android.i18n.phonenumbers.PhoneNumberOfflineGeocoder

     */

    private static String getGeoDescription(Context context, String number) {

        if (VDBG) Log.v(TAG, "getGeoDescription('" + number + "')...");