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

Commit d7cfa61c authored by Jack Yu's avatar Jack Yu
Browse files

Cleaned up the flag minimal_telephony_cdm_check

Cleaned up the 24Q3 flag minimal_telephony_cdm_check

Test: atest FrameworksTelephonyTests
Test: Basic telephony functionality tests
Bug: 310710841
Flag: EXEMPT flag cleanup
Change-Id: I6d62496815f1fec77a37adc824d93a27d32168fb
parent 10a606c8
Loading
Loading
Loading
Loading
+0 −8
Original line number Original line Diff line number Diff line
@@ -76,14 +76,6 @@ flag {
    bug: "290833783"
    bug: "290833783"
}
}


# OWNER=jackyu TARGET=24Q3
flag {
    name: "minimal_telephony_cdm_check"
    namespace: "telephony"
    description: "This flag disables Calling/Data/Messaging features if their respective feature is missing"
    bug: "310710841"
}

# OWNER=jackyu TARGET=24Q3
# OWNER=jackyu TARGET=24Q3
flag {
flag {
    name: "minimal_telephony_managers_conditional_on_features"
    name: "minimal_telephony_managers_conditional_on_features"
+1 −3
Original line number Original line Diff line number Diff line
@@ -207,9 +207,7 @@ public class TelephonyCapabilities {
        // Check SDK version of the vendor partition.
        // Check SDK version of the vendor partition.
        final int vendorApiLevel = SystemProperties.getInt(
        final int vendorApiLevel = SystemProperties.getInt(
                "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
                "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
        if (vendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) return false;
        return vendorApiLevel >= Build.VERSION_CODES.VANILLA_ICE_CREAM;

        return featureFlags.minimalTelephonyCdmCheck();
    }
    }


    /**
    /**
+0 −1
Original line number Original line Diff line number Diff line
@@ -580,7 +580,6 @@ public abstract class TelephonyTest {
        mDomainSelectionResolver = Mockito.mock(DomainSelectionResolver.class);
        mDomainSelectionResolver = Mockito.mock(DomainSelectionResolver.class);
        mNullCipherNotifier = Mockito.mock(NullCipherNotifier.class);
        mNullCipherNotifier = Mockito.mock(NullCipherNotifier.class);


        doReturn(true).when(mFeatureFlags).minimalTelephonyCdmCheck();
        doReturn(true).when(mFeatureFlags).hsumBroadcast();
        doReturn(true).when(mFeatureFlags).hsumBroadcast();
        doReturn(true).when(mFeatureFlags).hsumPackageManager();
        doReturn(true).when(mFeatureFlags).hsumPackageManager();
        doReturn(true).when(mFeatureFlags).dataServiceCheck();
        doReturn(true).when(mFeatureFlags).dataServiceCheck();