OSDN Git Service

Merge "The index value shall be -1 if there is no relevant application"
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 4 Dec 2018 23:17:55 +0000 (23:17 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 4 Dec 2018 23:17:55 +0000 (23:17 +0000)
libril/ril_service.cpp [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 8e52b82..e35230d
@@ -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