Revert "[BugFix][T106BUG-3] Resolve ril issue service exceptions"
This reverts commit 102e781149d926b85073dbf65693783a86203d4d.
Reason for revert: <INSERT REASONING HERE>
Change-Id: If8d7c5164df8b0f0434d4d135365634b2c918102
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/common.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/common.cpp
index 001a320..2dc75d1 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/common.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/common.cpp
@@ -565,14 +565,8 @@
cur_CardS_Status[slot]->applications[i].pin1 = card_status->applications[i].pin1;
cur_CardS_Status[slot]->applications[i].pin1_replaced = card_status->applications[i].pin1_replaced;
cur_CardS_Status[slot]->applications[i].pin2 = card_status->applications[i].pin2;
- if(card_status->applications[i].aid_ptr != NULL
- && card_status->applications[i].app_label_ptr != NULL)
- {
- cur_CardS_Status[slot]->applications[i].aid_ptr
- = strdup(card_status->applications[i].aid_ptr);
- cur_CardS_Status[slot]->applications[i].app_label_ptr
- = strdup(card_status->applications[i].app_label_ptr);
- }
+ cur_CardS_Status[slot]->applications[i].aid_ptr = strdup(card_status->applications[i].aid_ptr);
+ cur_CardS_Status[slot]->applications[i].app_label_ptr = strdup(card_status->applications[i].app_label_ptr);
}
} else {
RLOGD("[slot%d]updateCardStatusV6: sim card message is null", slot);
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/makefile b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/makefile
index 13a821f..3da0640 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/makefile
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/makefile
@@ -23,13 +23,11 @@
LOCAL_CFLAGS += -DC2K_SUPPORT
endif
-ifeq ($(strip $(TARGET_PLATFORM)), T800)
ifeq ($(strip $(MTK_MULTI_SIM_SUPPORT)), dsds)
LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2 \
-DANDROID_MULTI_SIM \
-DMODE_DSDS
endif
-endif
ifeq ($(strip $(MTK_MULTI_SIM_SUPPORT)), dsss)
LOCAL_CFLAGS += -DMODE_DSSS
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
index b0685e3..1233bf6 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -4053,10 +4053,7 @@
}
#endif
-#if defined(ANDROID_MULTI_SIM)
socket_id = pRI->socket_id;
-#endif
-
#if 0
#if (SIM_COUNT >= 2)
if (socket_id == RIL_SOCKET_2) {