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

Commit 5ebd2170 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag enforce_telephony_feature_mapping_for_public_apis" into main

parents 10a606c8 f40fc09d

flags/misc.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -52,14 +52,6 @@ flag { 
    bug:"271921464"

}



# OWNER=joonhunshin TARGET=24Q3

flag {

    name: "enforce_telephony_feature_mapping_for_public_apis"

    namespace: "telephony"

    description: "This flag controls telephony feature flags mapping for public APIs and CTS."

    bug:"297989574"

}



# OWNER=stevestatia TARGET=24Q3

flag {

    name: "prevent_system_server_and_phone_deadlock"

src/java/com/android/internal/telephony/Phone.java

+3 −10
Original line number Diff line number Diff line
@@ -1065,12 +1065,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    public void notifySmsSent(String destinationAddress) {

        TelephonyManager m = (TelephonyManager) getContext().getSystemService(

                Context.TELEPHONY_SERVICE);

        if (!mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()) {

            if (m != null && m.isEmergencyNumber(destinationAddress)) {

                mLocalLog.log("Emergency SMS detected, recording time.");

                mTimeLastEmergencySmsSentMs = SystemClock.elapsedRealtime();

            }

        } else {

        if (mContext.getPackageManager() != null

                && mContext.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_TELEPHONY_CALLING)) {
@@ -1080,7 +1074,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            }

        }

    }

    }



    /**

     * Determine if the Phone has recently sent an emergency SMS and is still in the interval of

src/java/com/android/internal/telephony/PhoneSubInfoController.java

+1 −2
Original line number Diff line number Diff line
@@ -861,8 +861,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
            return;

        }



        if (!mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()

                || !CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,

        if (!CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,

                Binder.getCallingUserHandle())

                || mVendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) {

            // Skip to check associated telephony feature,

src/java/com/android/internal/telephony/SmsController.java

+1 −2
Original line number Diff line number Diff line
@@ -1254,8 +1254,7 @@ public class SmsController extends ISmsImplBase { 
            return;

        }



        if (!mFlags.enforceTelephonyFeatureMappingForPublicApis()

                || !CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,

        if (!CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,

                Binder.getCallingUserHandle())

                || mVendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) {

            // Skip to check associated telephony feature,

src/java/com/android/internal/telephony/euicc/EuiccCardController.java

+1 −2
Original line number Diff line number Diff line
@@ -1544,8 +1544,7 @@ public class EuiccCardController extends IEuiccCardController.Stub { 
            return;

        }



        if (!mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()

                || !CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,

        if (!CompatChanges.isChangeEnabled(ENABLE_FEATURE_MAPPING, callingPackage,

                Binder.getCallingUserHandle())

                || mVendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) {

            // Skip to check associated telephony feature,