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

Commit 8d686057 authored by Madhav's avatar Madhav
Browse files

Update notifyEmergencyNumberList() feature flag dependency 

Given that  notifyEmergencyNumberList() 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: Ie6d24949add3dbcd41fcee449c30a96d2983e710
parent 8238a656

services/core/java/com/android/server/TelephonyRegistry.java

+4 −3
Original line number Diff line number Diff line
@@ -2816,10 +2816,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        if (!checkNotifyPermission("notifyEmergencyNumberList()")) {

            return;

        }

        if (!mContext.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_TELEPHONY_CALLING)) {

        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CALLING)

                && !mContext.getPackageManager()

                        .hasSystemFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING)) {

            // TelephonyManager.getEmergencyNumberList() throws an exception if

            // FEATURE_TELEPHONY_CALLING is not defined.

            // FEATURE_TELEPHONY_CALLING or FEATURE_TELEPHONY_MESSAGING is not defined.

            return;

        }