summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuto Sawada <ryuto.sawada@sony.com>2018-12-04 15:53:39 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-04 15:53:39 -0800
commitf20719661fca235b082074fa4b4cb26b9baeadf7 (patch)
treeca47d8308f86aef21712c0d0dd21f1e122c03cfd
parent6320625d65466ddbe7dcb5f2373b925442526a09 (diff)
parent4df763b290d3eac024842dc8282e1c786fb28d65 (diff)
downloadplatform_hardware_ril-f20719661fca235b082074fa4b4cb26b9baeadf7.tar.gz
platform_hardware_ril-f20719661fca235b082074fa4b4cb26b9baeadf7.tar.bz2
platform_hardware_ril-f20719661fca235b082074fa4b4cb26b9baeadf7.zip
Merge "The index value shall be -1 if there is no relevant application" am: 902fa44011
am: 4df763b290 Change-Id: I11f48f72a98d0fcc5e75b979b512844c23bd1797
-rwxr-xr-x[-rw-r--r--]libril/ril_service.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index 8e52b82e..e35230db 100644..100755
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -3012,7 +3012,7 @@ int radio::getIccCardStatusResponse(int slotId,
if (radioService[slotId]->mRadioResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
- CardStatus cardStatus = {};
+ CardStatus cardStatus = {CardState::ABSENT, PinState::UNKNOWN, -1, -1, -1, {}};
RIL_CardStatus_v6 *p_cur = ((RIL_CardStatus_v6 *) response);
if (response == NULL || responseLen != sizeof(RIL_CardStatus_v6)
|| p_cur->gsm_umts_subscription_app_index >= p_cur->num_applications