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

Commit 8cebd7f8 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: I8569776c3c4ae1ba9b346495e51b846fbe065f74
parent 6faccb8a

src/com/android/contacts/ContactsUtils.java

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


package com.android.contacts;



import com.google.i18n.phonenumbers.NumberParseException;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

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

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.MatchType;

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



import android.content.Context;

import android.content.Intent;

src/com/android/contacts/interactions/PhoneNumberInteraction.java

+4 −4
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ import com.android.contacts.model.AccountType; 
import com.android.contacts.model.AccountType.StringInflater;

import com.android.contacts.model.AccountTypeManager;

import com.android.contacts.model.DataKind;

import com.android.i18n.phonenumbers.NumberParseException;

import com.android.i18n.phonenumbers.PhoneNumberUtil;

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

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

import com.google.common.annotations.VisibleForTesting;

import com.google.i18n.phonenumbers.NumberParseException;

import com.google.i18n.phonenumbers.PhoneNumberUtil;

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

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



import android.app.Activity;

import android.app.AlertDialog;

src/com/android/contacts/model/AccountTypeManager.java

+1 −1
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.contacts.model;



import com.android.i18n.phonenumbers.PhoneNumberUtil;

import com.android.internal.util.Objects;

import com.google.android.collect.Lists;

import com.google.android.collect.Maps;

import com.google.android.collect.Sets;

import com.google.common.annotations.VisibleForTesting;

import com.google.i18n.phonenumbers.PhoneNumberUtil;



import android.accounts.Account;

import android.accounts.AccountManager;