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

Commit b6f88edb authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow use of EmergencyNumberTracker when CALLING or MESSAGING is enabled" into main

parents 895ca4f8 c6f7a968

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+8 −4
Original line number Diff line number Diff line
@@ -187,10 +187,14 @@ public class EmergencyNumberTracker extends Handler { 
        mFeatureFlags = featureFlags;

        mResources = ctx.getResources();



        if (TelephonyCapabilities.minimalTelephonyCdmCheck(mFeatureFlags)

                && !ctx.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_TELEPHONY_CALLING)) {

            throw new UnsupportedOperationException("EmergencyNumberTracker requires calling");

        if (TelephonyCapabilities.minimalTelephonyCdmCheck(mFeatureFlags)) {

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

                    && !ctx.getPackageManager()

                            .hasSystemFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING)) {

                throw new UnsupportedOperationException(

                        "EmergencyNumberTracker requires telephony calling or messaging feature to"

                                + " be enabled");

            }

        }



        if (mPhone != null) {