diff options
| author | Brian Orr <brianorr@google.com> | 2021-06-15 12:47:53 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-06-17 13:37:54 -0700 |
| commit | 71c831703ae59baf47e0afe611fecd714c481cdf (patch) | |
| tree | 06731a987032723085b9e1a65951cf96abbc19cf /telephony/java/com | |
| parent | 065c9e9a6e9d61d4383a91721eb56a3de253bdbe (diff) | |
| parent | 81833820d54b9a6b27894f9f8dfd72222d416992 (diff) | |
Merge SP1A.210604.001
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
Diffstat (limited to 'telephony/java/com')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 12 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 4cd59a24b182..a096c1f3b8b2 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -2352,6 +2352,12 @@ interface ITelephony { void setActiveDeviceToDeviceTransport(String transport); /** + * Forces Device to Device communication to be enabled, even if the device config has it + * disabled. + */ + void setDeviceToDeviceForceEnabled(boolean isForceEnabled); + + /** * Gets the config of RCS VoLTE single registration enabled for the carrier/subscription. */ boolean getCarrierSingleRegistrationEnabled(int subId); @@ -2434,6 +2440,12 @@ interface ITelephony { boolean removeUceRequestDisallowedStatus(int subId); /** + * Set the timeout for contact capabilities request. + * Note: This is designed for a SHELL command only. + */ + boolean setCapabilitiesRequestTimeout(int subId, long timeoutAfterMs); + + /** * Set a SignalStrengthUpdateRequest to receive notification when Signal Strength breach the * specified thresholds. */ diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 7578024ca95f..2c258d97c1a9 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -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; @@ -586,6 +589,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; |