commit 5d2a50eca05c949d852f9c57d2cb0d8b4dd1c5f3
author rjw <rjw@exm.com> Mon Feb 28 15:01:49 2022 +0800
committer rjw <rjw@exm.com> Mon Feb 28 15:01:49 2022 +0800
tree 38b0687b3c00862657aacbf8c11f2b7c35f1f62d
parent 9cc7db2bdfd0484cd39cd7cd77a05a831ea0751a

[Feature]Merge MR0.5 RIL and gnss related content

Change-Id: Ida412e15319debce294feb6bc9991877d848c1c3

framework/lynq-ril-service/src/data/data_gdbus.cpp

diff --git a/framework/lynq-ril-service/src/data/data_gdbus.cpp b/framework/lynq-ril-service/src/data/data_gdbus.cpp
index 3d067b8..cd62eb1 100755
--- a/framework/lynq-ril-service/src/data/data_gdbus.cpp
+++ b/framework/lynq-ril-service/src/data/data_gdbus.cpp
@@ -95,6 +95,7 @@
                     p.writeInt32 (LYNQ_URC_DATA_CALL_STATUS_IND);
                     p.writeInt32 (0);//temporary plan
                     p.writeInt32(PDN_DISCONNECTED);
+                    writeStringToParcel(p,urc_response->apnType);
                     android::LYNQ_RIL_urcBroadcast(p);
                     RLOGD("removed apn:%s,apntype:%s",apn_table[i].apn,apn_table[i].apntype);
                     //printf("removed apn:%s,apntype:%s\n",apn_table[i].apn,apn_table[i].apntype);

framework/lynq-ril-service/src/lynq_interface.h

diff --git a/framework/lynq-ril-service/src/lynq_interface.h b/framework/lynq-ril-service/src/lynq_interface.h
index 6179538..2a26b51 100755
--- a/framework/lynq-ril-service/src/lynq_interface.h
+++ b/framework/lynq-ril-service/src/lynq_interface.h
@@ -12,6 +12,7 @@
 #define LYNQ_REQUEST_READ_SMS_FROM_MEMORY (LYNQ_REQUEST_VENDOR_BASE + 5)
 #define LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY (LYNQ_REQUEST_VENDOR_BASE + 6)
 #define LYNQ_REQUEST_LIST_SMS_FROM_MEMORY (LYNQ_REQUEST_VENDOR_BASE + 7)
+#define LYNQ_REQUEST_SET_DEFAULT_SIM_ALL (LYNQ_REQUEST_VENDOR_BASE + 8)
 typedef struct{
     int request;
     int waitTime;

framework/lynq-ril-service/src/ril.cpp

diff --git a/framework/lynq-ril-service/src/ril.cpp b/framework/lynq-ril-service/src/ril.cpp
index 268c852..bc6133a 100755
--- a/framework/lynq-ril-service/src/ril.cpp
+++ b/framework/lynq-ril-service/src/ril.cpp
@@ -4857,6 +4857,7 @@
         case LYNQ_REQUEST_READ_SMS_FROM_MEMORY: return "LYNQ_REQUEST_READ_SMS_FROM_MEMORY";
         case LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY: return "LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY";
         case LYNQ_REQUEST_LIST_SMS_FROM_MEMORY: return "LYNQ_REQUEST_LIST_SMS_FROM_MEMORY";
+        case LYNQ_REQUEST_SET_DEFAULT_SIM_ALL:return "SET_DEFAULT_SIM_ALL";
         default: return "<unknown request>";
     }
 }
@@ -5118,6 +5119,7 @@
         case LYNQ_REQUEST_READ_SMS_FROM_MEMORY: return "LYNQ_REQUEST_READ_SMS_FROM_MEMORY";
         case LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY: return "LYNQ_REQUEST_DELETE_SMS_FROM_MEMORY";
         case LYNQ_REQUEST_LIST_SMS_FROM_MEMORY: return "LYNQ_REQUEST_LIST_SMS_FROM_MEMORY";
+        case LYNQ_REQUEST_SET_DEFAULT_SIM_ALL:return "SET_DEFAULT_SIM_ALL";
         /*warren add for t800 ril service 2022/1/22 end*/
         default: return "<unknown request>";
     }