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

Commit 332f6f46 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use com.google.i18n.phonenumbers" am: ecae0ed2 am: 9509bff2 

Change-Id: I33a7c4433395e28fa9e6b9f897ac5ba4d5c3db4d
parents 0a3a4dc1 9509bff2

Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -72,8 +72,9 @@ java_library { 
        "android.hardware.radio.config-V1.1-java-shallow",

        "android.hardware.radio.config-V1.1-java-shallow",

        "android.hardware.radio.config-V1.2-java-shallow",

        "android.hardware.radio.config-V1.2-java-shallow",

        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "android.hardware.radio.deprecated-V1.0-java-shallow",

        "telephony-protos",

        "ecc-protos-lite",

        "ecc-protos-lite",

        "libphonenumber-nogeocoder",

        "telephony-protos",

    ],

    ],





    product_variables: {

    product_variables: {

jarjar-rules-shared.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,3 +12,4 @@ rule com.android.internal.util.Preconditions* com.android.internal.telephony.Pre 
rule com.android.internal.util.State* com.android.internal.telephony.State@1

rule com.android.internal.util.State* com.android.internal.telephony.State@1

rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1

rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1

rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1

rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1

rule com.google.i18n.phonenumbers.** com.android.internal.telephony.phonenumbers.@1

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

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

import android.text.TextUtils;

import android.util.LocalLog;

import android.util.LocalLog;





import com.android.i18n.phonenumbers.ShortNumberInfo;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.LocaleTracker;

import com.android.internal.telephony.LocaleTracker;
@@ -50,6 +49,8 @@ import com.android.internal.util.IndentingPrintWriter; 
import com.android.phone.ecc.nano.ProtobufEccData;

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

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

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





import com.google.i18n.phonenumbers.ShortNumberInfo;



import java.io.BufferedInputStream;

import java.io.BufferedInputStream;

import java.io.ByteArrayOutputStream;

import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.File;