commit 31d3a3bbbc3c0cc9d9e36f5b0cd21bb0363c68ea
author Tomasz Wiszkowski <ender@google.com> Wed Sep 20 11:06:02 2017 -0700
committer Tomasz Wiszkowski <ender@google.com> Wed Sep 20 11:09:03 2017 -0700
tree 394e7cf3f14f7dcd6a3f325a38d50c19c4be7096
parent 4327dedf27ac34fd2309cdebbb4177e9b552c92b

Fix reporting of airplane mode wake-up.

This change resolves problem I introduced earlier by trying to re-establish data connection
after entering and leaving airplane mode.

Former fix worked, but triggered Android to request phone reboot, as it detected
SIM card being replaced. It turns out the whole problem was related to SIM_NOT_READY
not being reported to android in the first place.

Change-Id: I91f1ba4f47aaddbedabed8358bb63c7eff26f9fa

guest/ril/vsoc_ril.cpp

diff --git a/guest/ril/vsoc_ril.cpp b/guest/ril/vsoc_ril.cpp
index 9a17ee1..a1bd926 100644
--- a/guest/ril/vsoc_ril.cpp
+++ b/guest/ril/vsoc_ril.cpp
@@ -56,7 +56,7 @@
 
 static const struct RIL_Env* gce_ril_env;
 
-static const struct timeval TIMEVAL_SIMPOLL = {1,0};
+static const struct timeval TIMEVAL_SIMPOLL = {3,0};
 
 static time_t gce_ril_start_time;
 
@@ -345,19 +345,18 @@
 
     old_state = gRadioPowerState;
     gRadioPowerState = new_state;
+    gSimStatus = SIM_NOT_READY;
 
     ALOGV("RIL_RadioState change %d to %d", old_state, new_state);
 
     if (new_state == RADIO_STATE_ON) {
       gce_ril_env->OnUnsolicitedResponse(
           RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, NULL, 0);
-      gSimStatus = SIM_NOT_READY;
       pollSIMState(NULL);
     } else {
       // Drop connections.
       gDataCalls.clear();
       TearDownNetworkInterface();
-      gSimStatus = SIM_ABSENT;
       pollSIMState(NULL);
     }
 
@@ -1885,30 +1884,27 @@
     case SIM_NETWORK_PERSONALIZATION:
     default:
       ALOGV("SIM Absent or Locked");
-      gce_ril_env->OnUnsolicitedResponse(
-          RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, NULL, 0);
-      return;
+      break;
 
     case SIM_NOT_READY:
       // Transition directly to READY. Set default network operator.
       if (gRadioPowerState == RADIO_STATE_ON) {
         gSimStatus = SIM_READY;
+        gCurrentNetworkOperator = "310260";
       }
 
-      gCurrentNetworkOperator = "310260";
-
       gce_ril_env->RequestTimedCallback(
           pollSIMState, NULL, &TIMEVAL_SIMPOLL);
-      return;
+      break;
 
     case SIM_READY:
       ALOGV("SIM Ready. Notifying network state changed.");
-      gce_ril_env->OnUnsolicitedResponse(
-          RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, NULL, 0);
-      gce_ril_env->OnUnsolicitedResponse (
-          RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, NULL, 0);
-      return;
+      break;
   }
+  gce_ril_env->OnUnsolicitedResponse(
+      RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED, NULL, 0);
+  gce_ril_env->OnUnsolicitedResponse (
+      RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, NULL, 0);
 }
 
 std::map<SIM_Status, RIL_AppStatus> gRilAppStatus;