Use com.google.i18n.phonenumbers
instead of the platform copy com.android.i18n.phonenumbers which is a hidden API.
Bug: 137202333
Test: make
Change-Id: Ie02727e4af17cfd1851861c6e2749e77d350b06c
diff --git a/Android.bp b/Android.bp
index 5c79cf9..0ff7f0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,8 +72,9 @@
"android.hardware.radio.config-V1.1-java-shallow",
"android.hardware.radio.config-V1.2-java-shallow",
"android.hardware.radio.deprecated-V1.0-java-shallow",
- "telephony-protos",
"ecc-protos-lite",
+ "libphonenumber-nogeocoder",
+ "telephony-protos",
],
product_variables: {
diff --git a/jarjar-rules-shared.txt b/jarjar-rules-shared.txt
index 6312825..6c03fa7 100644
--- a/jarjar-rules-shared.txt
+++ b/jarjar-rules-shared.txt
@@ -11,3 +11,4 @@
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.UserIcons* com.android.internal.telephony.UserIcons@1
+rule com.google.i18n.phonenumbers.** com.android.internal.telephony.phonenumbers.@1
diff --git a/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java b/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java
index a0feb80..48bbc8b 100644
--- a/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java
+++ b/src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java
@@ -36,7 +36,6 @@
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;
@@ -50,6 +49,8 @@
import com.android.phone.ecc.nano.ProtobufEccData;
import com.android.phone.ecc.nano.ProtobufEccData.EccInfo;
+import com.google.i18n.phonenumbers.ShortNumberInfo;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;