Merge "Allows APN to be unthrottled through an indication" am: 7bfe3131a6 am: 0c8bf2df88 am: f6282fb276 am: 6d034c6c1e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1479416

Change-Id: I2bddcebc0413aac48cec80b30a16a9b28dd7be92
This commit is contained in:
Daniel Bright 2020-11-06 06:41:15 +00:00 committed by Automerger Merge Worker
commit 24797eb180
3 changed files with 21 additions and 0 deletions

View file

@ -40,4 +40,17 @@ interface IRadioIndication extends @1.5::IRadioIndication {
* 3. Unsolicited disconnect from either modem or network side. * 3. Unsolicited disconnect from either modem or network side.
*/ */
oneway dataCallListChanged_1_6(RadioIndicationType type, vec<SetupDataCallResult> dcList); oneway dataCallListChanged_1_6(RadioIndicationType type, vec<SetupDataCallResult> dcList);
/**
* The modem can explicitly set SetupDataCallResult::suggestedRetryTime after a failure in
* IRadio@1.6::SetupDataCall. During that time, no new calls are allowed to
* IRadio@1.6::SetupDataCall that use the same APN.
*
* When IRadioIndication@1.6::unthrottleApn is sent, AOSP will no longer throttle calls
* to IRadio@1.6::SetupDataCall for the given APN.
*
* @param type Type of radio indication
* @param apn Apn to unthrottle
*/
oneway unthrottleApn(RadioIndicationType type, string apn);
}; };

View file

@ -808,6 +808,9 @@ class RadioIndication_v1_6 : public ::android::hardware::radio::V1_6::IRadioIndi
RadioIndicationType type, RadioIndicationType type,
const hidl_vec<::android::hardware::radio::V1_6::SetupDataCallResult>& dcList); const hidl_vec<::android::hardware::radio::V1_6::SetupDataCallResult>& dcList);
Return<void> unthrottleApn(RadioIndicationType type,
const ::android::hardware::hidl_string& apn);
/* 1.5 Api */ /* 1.5 Api */
Return<void> uiccApplicationsEnablementChanged(RadioIndicationType type, bool enabled); Return<void> uiccApplicationsEnablementChanged(RadioIndicationType type, bool enabled);

View file

@ -25,6 +25,11 @@ Return<void> RadioIndication_v1_6::dataCallListChanged_1_6(
return Void(); return Void();
} }
Return<void> RadioIndication_v1_6::unthrottleApn(RadioIndicationType /*type*/,
const ::android::hardware::hidl_string& /*apn*/) {
return Void();
}
/* 1.5 Apis */ /* 1.5 Apis */
Return<void> RadioIndication_v1_6::uiccApplicationsEnablementChanged(RadioIndicationType /*type*/, Return<void> RadioIndication_v1_6::uiccApplicationsEnablementChanged(RadioIndicationType /*type*/,
bool /*enabled*/) { bool /*enabled*/) {