OSDN Git Service

Merge "Fix VTS test case HidlHalGTest#RadioHidlTest.getIccCardStatus_32bit failed."
authorkun.tang <kun.tang@spreadtrum.com>
Wed, 12 Jul 2017 23:44:00 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 23:44:00 +0000 (23:44 +0000)
am: 78b80ee72d

Change-Id: Ic3f8b88e1b96d190ba09852f5436e65d017d8442

reference-ril/reference-ril.c

index 22f93c5..c20fb81 100644 (file)
@@ -2845,9 +2845,9 @@ static int getCardStatus(RIL_CardStatus_v6 **pp_card_status) {
     RIL_CardStatus_v6 *p_card_status = malloc(sizeof(RIL_CardStatus_v6));
     p_card_status->card_state = card_state;
     p_card_status->universal_pin_state = RIL_PINSTATE_UNKNOWN;
-    p_card_status->gsm_umts_subscription_app_index = RIL_CARD_MAX_APPS;
-    p_card_status->cdma_subscription_app_index = RIL_CARD_MAX_APPS;
-    p_card_status->ims_subscription_app_index = RIL_CARD_MAX_APPS;
+    p_card_status->gsm_umts_subscription_app_index = -1;
+    p_card_status->cdma_subscription_app_index = -1;
+    p_card_status->ims_subscription_app_index = -1;
     p_card_status->num_applications = num_apps;
 
     // Initialize application status