commit 2640571b03bb2a95dbab65882bf7fce331d1e894
author Lorenzo Colitti <lorenzo@google.com> Fri Sep 10 18:27:11 2010 -0700
committer Lorenzo Colitti <lorenzo@google.com> Fri Sep 10 18:32:08 2010 -0700
tree 797e7f0fa56683a7bbb7b89efbc11337bdc3ce08
parent 79835c953f457f8471415eeda5f7a8907d723673

Properly handle version 3 vendor RILs.

Change-Id: I5a876aaebc17287a763eb243e2f2cdaff676c90b

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index dc683ff..d66aa77 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -2554,14 +2554,15 @@
     int flags;
 
     if (callbacks == NULL || ((callbacks->version != RIL_VERSION)
-                && (callbacks->version != 2))) { // 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 (callbacks->version < RIL_VERSION) {
+        LOGE ("RIL_register: upgrade RIL to version %d current version=%d",
+              RIL_VERSION, callbacks->version);
     }
 
     if (s_registerCalled > 0) {