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

Commit 0ff711d1 authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "Revert "use PhoneNumber API in libphonenumber static lib""

parents 308431f7 e29bae06

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ java_library { 
        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "telephony-protos",

        "ecc-protos-lite",

        "libphonenumber",

    ],



    product_variables: {

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories; 
import android.text.TextUtils;

import android.util.LocalLog;





import com.android.i18n.phonenumbers.ShortNumberInfo;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.LocaleTracker;
@@ -48,7 +48,6 @@ import com.android.internal.telephony.metrics.TelephonyMetrics; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.phone.ecc.nano.ProtobufEccData;

import com.android.phone.ecc.nano.ProtobufEccData.EccInfo;

import com.google.i18n.phonenumbers.ShortNumberInfo;



import libcore.io.IoUtils;