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

Commit 039a8f3a authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Optimize SIM phonebook feature with new APIs" into sc-dev am: 81d05fcd am: fee0397a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14521565

Change-Id: I7a32493f0eb3b2c4e9f4bcad9c7e0cfac06947e7
parents 3e601953 fee0397a

telephony/java/android/telephony/TelephonyManager.java

+10 −0
Original line number Diff line number Diff line
@@ -15020,6 +15020,15 @@ public class TelephonyManager { 
    public static final String CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED =

            "CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED";













    /**













     * Indicates whether modem supports handling parsed SIM phonebook records through the RIL,













     * both batched reads and individual writes.













     *













     * @hide













     */













    public static final String CAPABILITY_SIM_PHONEBOOK_IN_MODEM =













            "CAPABILITY_SIM_PHONEBOOK_IN_MODEM";



























    /**















     * A list of the radio interface capability values with public valid constants.















     *









@@ -15035,6 +15044,7 @@ public class TelephonyManager {













    @Retention(RetentionPolicy.SOURCE)















    @StringDef(prefix = "CAPABILITY_", value = {















            CAPABILITY_SLICING_CONFIG_SUPPORTED,













            CAPABILITY_SIM_PHONEBOOK_IN_MODEM,















    })















    public @interface RadioInterfaceCapability {}







































telephony/java/com/android/internal/telephony/RILConstants.java



+5
−0






























Original line number
Diff line number
Diff line








@@ -497,6 +497,9 @@ public interface RILConstants {













    int RIL_REQUEST_ENABLE_MODEM = 146;















    int RIL_REQUEST_GET_MODEM_STATUS = 147;















    int RIL_REQUEST_CDMA_SEND_SMS_EXPECT_MORE = 148;













    int RIL_REQUEST_GET_SIM_PHONEBOOK_CAPACITY = 149;













    int RIL_REQUEST_GET_SIM_PHONEBOOK_RECORDS = 150;













    int RIL_REQUEST_UPDATE_SIM_PHONEBOOK_RECORD = 151;































    /* The following requests are not defined in RIL.h */















    int RIL_REQUEST_HAL_NON_RIL_BASE = 200;










@@ -583,6 +586,8 @@ public interface RILConstants {













    int RIL_UNSOL_NETWORK_SCAN_RESULT = 1049;















    int RIL_UNSOL_KEEPALIVE_STATUS = 1050;















    int RIL_UNSOL_UNTHROTTLE_APN = 1052;













    int RIL_UNSOL_RESPONSE_SIM_PHONEBOOK_CHANGED = 1053;













    int RIL_UNSOL_RESPONSE_SIM_PHONEBOOK_RECORDS_RECEIVED = 1054;































    /* The following unsols are not defined in RIL.h */















    int RIL_UNSOL_HAL_NON_RIL_BASE = 1100;