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

Commit ea31a4bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the capability list for reduced feature set devices." into sc-dev am: d2ad2033 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14987005

Change-Id: I83e1e3d023076dba51967c0be047c2b38ba7e3ac
parents 5e7bd670 d2ad2033

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

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ public class RadioConfigResponse extends IRadioConfigResponse.Stub { 
                Rlog.d(TAG, "CAPABILITY_SLICING_CONFIG_SUPPORTED");

                caps.add(CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED);

                Rlog.d(TAG, "CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED");

            } else {

                caps.add(CAPABILITY_SIM_PHONEBOOK_IN_MODEM);

                Rlog.d(TAG, "CAPABILITY_SIM_PHONEBOOK_IN_MODEM");

            }

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

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_SIM_PHONEBOOK_IN_MODEM));

    }



    @Test
@@ -88,5 +90,7 @@ public class RadioConfigResponseTest extends TelephonyTest { 
                caps.contains(TelephonyManager.CAPABILITY_THERMAL_MITIGATION_DATA_THROTTLING));

        assertTrue(

                caps.contains(TelephonyManager.CAPABILITY_SLICING_CONFIG_SUPPORTED));

        assertFalse(

                caps.contains(TelephonyManager.CAPABILITY_SIM_PHONEBOOK_IN_MODEM));

    }

}