From 3650f2c5051fe0489cf612e1ffe29dd3da4910e6 Mon Sep 17 00:00:00 2001 From: Madhav Date: Mon, 10 Feb 2025 20:32:36 +0000 Subject: Update isEmergencyNumber() feature flag dependency Given that isEmergencyNumber() 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 FEATURE_TELEPHONY_CALLING or FEATURE_TELEPHONY_MESSAGING. Bug: 395178686 Flag: EXEMPT bug fix Test: atest CtsTelephonyTestCases --no-bazel-mode Change-Id: I7967ce12e817a35e7b5f57058232bc100bd16023 --- 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 2983e4442a78..531fe1adcadb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -15618,9 +15618,13 @@ public class TelephonyManager { * SIM card(s), Android database, modem, network or defaults; {@code false} otherwise. * @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}. */ - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) public boolean isEmergencyNumber(@NonNull String number) { try { ITelephony telephony = getITelephony(); -- cgit v1.2.3-59-g8ed1b From 06580ed2adb786e8007c7a4db3106456680a172d Mon Sep 17 00:00:00 2001 From: Madhav Date: Fri, 28 Feb 2025 01:02:52 +0000 Subject: Update getEmergencyNumberList() feature flag dependency Given that getEmergencyNumberList() 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 FEATURE_TELEPHONY_CALLING or FEATURE_TELEPHONY_MESSAGING. Bug: 395178686 Flag: EXEMPT bug fix Test: atest CtsTelephonyTestCases --no-bazel-mode Change-Id: I8f33a5e58a7571dc9baa379efc4c1e7bcd3166ca --- telephony/java/android/telephony/TelephonyManager.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 531fe1adcadb..f8797e3904a5 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -15490,11 +15490,15 @@ public class TelephonyManager { * or throw a SecurityException if the caller does not have the permission. * * @throws UnsupportedOperationException If the device does not have - * {@link PackageManager#FEATURE_TELEPHONY_CALLING}. + * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @NonNull - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) public Map> getEmergencyNumberList() { Map> emergencyNumberList = new HashMap<>(); try { @@ -15548,11 +15552,15 @@ public class TelephonyManager { * or throw a SecurityException if the caller does not have the permission. * @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}. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @NonNull - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) public Map> getEmergencyNumberList( @EmergencyServiceCategories int categories) { Map> emergencyNumberListForCategories = new HashMap<>(); -- cgit v1.2.3-59-g8ed1b 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 From 8238a656097130e19b0ccafeecbb51bbb1bc20f6 Mon Sep 17 00:00:00 2001 From: Madhav Date: Wed, 5 Mar 2025 01:58:05 +0000 Subject: Update *EmergencyNumberDb*() feature flag dependency Given that *EmergencyNumberDb*() 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 FEATURE_TELEPHONY and not FEATURE_TELEPHONY_CALLING. Bug: 395178686 Flag: EXEMPT bug fix Test: atest CtsTelephonyTestCases --no-bazel-mode Change-Id: I4da90c5f78a0fcbdb5b56d90aad43e0f696dc6c1 --- .../java/android/telephony/TelephonyManager.java | 34 ++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'telephony') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c9617b21162b..7b2e6c2013cf 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -15347,11 +15347,15 @@ public class TelephonyManager { * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} * * @throws UnsupportedOperationException If the device does not have - * {@link PackageManager#FEATURE_TELEPHONY_CALLING}. + * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) @SystemApi public void notifyOtaEmergencyNumberDbInstalled() { try { @@ -15376,11 +15380,15 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_ACTIVE_EMERGENCY_SESSION} * * @throws UnsupportedOperationException If the device does not have - * {@link PackageManager#FEATURE_TELEPHONY_CALLING}. + * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) @SystemApi public void updateOtaEmergencyNumberDbFilePath( @NonNull ParcelFileDescriptor otaParcelFileDescriptor) { @@ -15404,11 +15412,15 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_ACTIVE_EMERGENCY_SESSION} * * @throws UnsupportedOperationException If the device does not have - * {@link PackageManager#FEATURE_TELEPHONY_CALLING}. + * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) - @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING) + @RequiresFeature(anyOf = { + PackageManager.FEATURE_TELEPHONY_CALLING, + PackageManager.FEATURE_TELEPHONY_MESSAGING + }) @SystemApi public void resetOtaEmergencyNumberDbFilePath() { try { @@ -15701,15 +15713,19 @@ public class TelephonyManager { * Returns the emergency number database version. * *

Requires Permission: - * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE} + * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} * * @throws UnsupportedOperationException If the device does not have - * {@link PackageManager#FEATURE_TELEPHONY_CALLING}. + * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or + * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}. * @hide */ @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 int getEmergencyNumberDbVersion() { try { ITelephony telephony = getITelephony(); -- cgit v1.2.3-59-g8ed1b