commit 445e764367b98b214ac5640d389fc9218293fe8a
author paulye <paulye@google.com> Wed Feb 27 18:19:56 2019 -0800
committer Greg Hartman <ghartman@google.com> Fri Mar 22 12:53:34 2019 -0700
tree 56f000e1fbd3a1e87676e47e8e387315a9855b88
parent f13e7492bb1da579f020b8e56d4d909d0ccc2318

Populate radio access family

Bug: 121345980
Change-Id: I001cad5e553531b98e5b027e51c8e907a26cced3
Test: VTS

guest/hals/ril/cuttlefish_ril.cpp

diff --git a/guest/hals/ril/cuttlefish_ril.cpp b/guest/hals/ril/cuttlefish_ril.cpp
index 1a8aad3..4dae152 100644
--- a/guest/hals/ril/cuttlefish_ril.cpp
+++ b/guest/hals/ril/cuttlefish_ril.cpp
@@ -114,6 +114,7 @@
 static void pollSIMState(void* param);
 
 RIL_RadioState gRadioPowerState = RADIO_STATE_OFF;
+RIL_RadioAccessFamily default_access = RAF_LTE;
 
 struct DataCall {
   enum AllowedAuthenticationType { kNone = 0, kPap = 1, kChap = 2, kBoth = 3 };
@@ -2294,14 +2295,13 @@
                                                RIL_Token t) {
   RIL_RadioAccessFamily desired_access = *(RIL_RadioAccessFamily*)(data);
 
-  ALOGV("Requesting modem technology change -> %d", desired_access);
+  ALOGV("Requesting modem technology change %d -> %d", default_access, desired_access);
 
   /** TODO future implementation: set modem type based on radio access family.
    * 1) find supported_technologies and desired_technologies
    * 2) return RIL_E_MODE_NOT_SUPPORTED error if not supported
-   * 3) set modem current type and radio technology according to the radio access family
    */
-  ALOGV("Modem technology skip set to %d.", desired_access);
+  default_access = desired_access;
   gce_ril_env->OnRequestComplete(t, RIL_E_SUCCESS, NULL, 0);
   return;
 }
@@ -2309,11 +2309,7 @@
 static void request_get_preferred_network_type_bitmap(int /*request*/, void* /*data*/,
                                                size_t /*datalen*/,
                                                RIL_Token t) {
-  ALOGV("Requesting modem radio access family, default -> %d", RAF_LTE);
-  /** TODO future implementation: return radio access family of current modem
-   * return a default value for now.
-   */
-  RIL_RadioAccessFamily default_access = RAF_LTE;
+  ALOGV("Requesting modem radio access family: %d", default_access);
   gce_ril_env->OnRequestComplete(
       t, RIL_E_SUCCESS, (RIL_RadioAccessFamily*)(&default_access), sizeof(default_access));
 }