Remove STOP SHIP logs and comments from ril.cpp.
bug: 2577644
Change-Id: I7021a12950b4a562c88c393ae75ad2394df3d655
diff --git a/libril/ril.cpp b/libril/ril.cpp
index eea2a70..a7fbaa1 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -587,8 +587,7 @@
goto invalid;
}
- if (s_callbacks.version < 3) { // STOP_SHIP: Remove when partners upgrade to version 3
- LOGE ("dispatchDial: STOP SHIP version < 3");
+ if (s_callbacks.version < 3) { // Remove when partners upgrade to version 3
uusPresent = 0;
sizeOfDial = sizeof(dial) - sizeof(RIL_UUS_Info *);
} else {
@@ -1375,9 +1374,8 @@
p.writeInt32(p_cur->numberPresentation);
writeStringToParcel(p, p_cur->name);
p.writeInt32(p_cur->namePresentation);
- // STOP_SHIP: Remove when partners upgrade to version 3
+ // Remove when partners upgrade to version 3
if ((s_callbacks.version < 3) || (p_cur->uusInfo == NULL || p_cur->uusInfo->uusData == NULL)) {
- LOGE ("responseCallList: NO uusInfo (STOP SHIP remove version < 3 test)");
p.writeInt32(0); /* UUS Information is absent */
} else {
RIL_UUS_Info *uusInfo = p_cur->uusInfo;
@@ -2528,12 +2526,15 @@
int flags;
if (callbacks == NULL || ((callbacks->version != RIL_VERSION)
- && (callbacks->version != 2))) { // STOP_SHIP: Remove when partners upgrade to version 3
+ && (callbacks->version != 2))) { // Remove when partners upgrade to version 3
LOGE(
"RIL_register: RIL_RadioFunctions * null or invalid version"
" (expected %d)", RIL_VERSION);
return;
}
+ if (callbacks->version < 3) {
+ LOGE ("RIL_register: upgrade RIL to version 3 current version=%d", callbacks->version);
+ }
if (s_registerCalled > 0) {
LOGE("RIL_register has been called more than once. "