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

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

Merge "Cleaned up the flag minimal_telephony_cdm_check" into main

parents 252085a7 d7cfa61c

flags/misc.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -68,14 +68,6 @@ flag { 
    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

flag {

    name: "minimal_telephony_managers_conditional_on_features"

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

+1 −3
Original line number Diff line number Diff line
@@ -207,9 +207,7 @@ public class TelephonyCapabilities { 
        // Check SDK version of the vendor partition.

        final int vendorApiLevel = SystemProperties.getInt(

                "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);

        if (vendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) return false;



        return featureFlags.minimalTelephonyCdmCheck();

        return vendorApiLevel >= Build.VERSION_CODES.VANILLA_ICE_CREAM;

    }



    /**

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

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

        mNullCipherNotifier = Mockito.mock(NullCipherNotifier.class);



        doReturn(true).when(mFeatureFlags).minimalTelephonyCdmCheck();

        doReturn(true).when(mFeatureFlags).hsumBroadcast();

        doReturn(true).when(mFeatureFlags).hsumPackageManager();

        doReturn(true).when(mFeatureFlags).dataServiceCheck();