commit 0c4ad12bdffd1d86e0f78bfddba7a3689fe9e257
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jun 29 01:27:32 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 29 01:27:32 2024 +0000
tree dac2e0e900105733c9e2140686989e3fde978fa3
parent 0578c602193b076071493a12ca9b2ac5b64837e5
parent 68f6f661fb58895425f6ec50337169059a6631a2

Merge "Return proper error code for requestIsSatelliteCommunicationAllowedForCurrentLocation" into main

ecc/input/eccdata.txt

diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index c4edc9e..95b70d5 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -1019,6 +1019,7 @@
   eccs {
     phone_number: "114"
     types: TYPE_UNSPECIFIED
+    routing: NORMAL
   }
   eccs {
     phone_number: "191"

ecc/output/eccdata

diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index 482ed79..513d6b9 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 07b027e..457fdd6 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4291,7 +4291,7 @@
     @Override
     public void disableVisualVoicemailSmsFilter(String callingPackage, int subId) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-
+        enforceVisualVoicemailPackage(callingPackage, subId);
         enforceTelephonyFeatureWithException(callingPackage,
                 PackageManager.FEATURE_TELEPHONY_CALLING, "disableVisualVoicemailSmsFilter");