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

Commit 06580ed2 authored by Madhav's avatar Madhav
Browse files

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
parent 3650f2c5

telephony/java/android/telephony/TelephonyManager.java

+12 −4
Original line number Diff line number Diff line
@@ -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<Integer, List<EmergencyNumber>> getEmergencyNumberList() {

        Map<Integer, List<EmergencyNumber>> 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<Integer, List<EmergencyNumber>> getEmergencyNumberList(

            @EmergencyServiceCategories int categories) {

        Map<Integer, List<EmergencyNumber>> emergencyNumberListForCategories = new HashMap<>();