From c846c39c895ec908dc7b0f51896a869b54711a8c Mon Sep 17 00:00:00 2001 From: Madhav Date: Fri, 28 Feb 2025 01:25:55 +0000 Subject: Update isPotentialEmergencyNumber() feature flag dependency Given that isPotentialEmergencyNumber() functionality is utilized by both calling and messaging modules, and messaging can be enabled without calling, the function's access control should be based on either FEATURE_TELEPHONY_CALLING or FEATURE_TELEPHONY_MESSAGING. Bug: 395178686 Flag: EXEMPT bug fix Test: atest CtsTelephonyTestCases --no-bazel-mode Change-Id: I7cd4ba3eda86f4fa277b04495419b934985fe968 --- telephony/java/android/telephony/TelephonyManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index f8797e3904a5..c9617b21162b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -15669,7 +15669,8 @@ public class TelephonyManager { * have the required permission/privileges * @throws IllegalStateException if the Telephony process is not currently available. * @throws UnsupportedOperationException If the device does not have - * {@link PackageManager#FEATURE_TELEPHONY_CALLING}. + * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * * @deprecated Please use {@link TelephonyManager#isEmergencyNumber(String)} instead. * @hide @@ -15677,7 +15678,10 @@ public class TelephonyManager { @Deprecated @SystemApi @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) public boolean isPotentialEmergencyNumber(@NonNull String number) { try { ITelephony telephony = getITelephony(); -- cgit v1.2.3-59-g8ed1b