commit 3e8f2c80f439cc088c38de1679e4fcf3bb8c433e
author Pankaj Kanwar <pkanwar@google.com> Mon Oct 09 23:50:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 09 23:50:58 2017 +0000
tree a623c339db246a1f3a56fbf7140c373a99ab5351
parent a66fd943178870fa98867596edfcdff495224c85
parent 83e7acd605373167f08578175b9cfa7e0c3d2d42

Merge "Fix rild crash"

include/telephony/ril.h

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 540ad48..d6a3aea 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -1369,8 +1369,8 @@
     int mnc;    /* 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown */
     int lac;    /* 16-bit Location Area Code, 0..65535, INT_MAX if unknown  */
     int cid;    /* 16-bit GSM Cell Identity described in TS 27.007, 0..65535, INT_MAX if unknown  */
-    int arfcn;  /* 16-bit GSM Absolute RF channel number, INT_MAX if unknown */
-    uint8_t bsic;/* 6-bit Base Station Identity Code, 0xFF if unknown */
+    int arfcn;  /* 16-bit GSM Absolute RF channel number; this value must be reported */
+    uint8_t bsic; /* 6-bit Base Station Identity Code; 0xFF if unknown */
 } RIL_CellIdentityGsm_v12;
 
 typedef struct {
@@ -1386,8 +1386,8 @@
     int mnc;    /* 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown  */
     int lac;    /* 16-bit Location Area Code, 0..65535, INT_MAX if unknown  */
     int cid;    /* 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown  */
-    int psc;    /* 9-bit UMTS Primary Scrambling Code described in TS 25.331, 0..511, INT_MAX if unknown */
-    int uarfcn; /* 16-bit UMTS Absolute RF Channel Number, INT_MAX if unknown */
+    int psc;    /* 9-bit UMTS Primary Scrambling Code described in TS 25.331, 0..511; this value must be reported */
+    int uarfcn; /* 16-bit UMTS Absolute RF Channel Number; this value must be reported */
 } RIL_CellIdentityWcdma_v12;
 
 typedef struct {
@@ -1417,9 +1417,9 @@
     int mcc;    /* 3-digit Mobile Country Code, 0..999, INT_MAX if unknown  */
     int mnc;    /* 2 or 3-digit Mobile Network Code, 0..999, INT_MAX if unknown  */
     int ci;     /* 28-bit Cell Identity described in TS ???, INT_MAX if unknown */
-    int pci;    /* physical cell id 0..503, INT_MAX if unknown  */
+    int pci;    /* physical cell id 0..503; this value must be reported */
     int tac;    /* 16-bit tracking area code, INT_MAX if unknown  */
-    int earfcn; /* 18-bit LTE Absolute RC Channel Number, INT_MAX if unknown */
+    int earfcn; /* 18-bit LTE Absolute RF Channel Number; this value must be reported */
 } RIL_CellIdentityLte_v12;
 
 typedef struct {

libril/sap_service.cpp

diff --git a/libril/sap_service.cpp b/libril/sap_service.cpp
index 2ac6745..ab43ee8 100644
--- a/libril/sap_service.cpp
+++ b/libril/sap_service.cpp
@@ -776,6 +776,13 @@
         return;
     }
 
+    if (messagePtr == NULL) {
+        RLOGE("processResponse: *messagePtr == NULL; msgId = %d; msgType = %d",
+                msgId, msgType);
+        sapImpl->sendFailedResponse(msgId, rsp->token, 0);
+        return;
+    }
+
     RLOGD("processResponse: sapCallback != NULL; msgId = %d; msgType = %d",
             msgId, msgType);
 

reference-ril/reference-ril.c

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index c20fb81..ba92b76 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -606,7 +606,7 @@
             }
             responses[i].dnses = dnslist;
 
-            responses[i].gateways = "10.0.2.2 fe80::2";
+            responses[i].gateways = "10.0.2.15 fe80::2";
             responses[i].mtu = DEFAULT_MTU;
         }
         else {