commit a1f03967caf8036b6b928155dbc4a9696c465353
author Sanket Agarwal <sanketa@google.com> Thu Nov 05 21:20:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 05 21:20:00 2015 +0000
tree 5274de9d9c7549bab3b51b4bd36d5d3de3e1f1b6
parent 7a564a0e201d8ddc7cc7b7a7202adf017b4e4836
parent f639ba1fdd4fd51d7ab97d2d8891a510615645f3

Merge "Add features for Automotive usecases."

radio/IRadioService.cpp

diff --git a/radio/IRadioService.cpp b/radio/IRadioService.cpp
index 8c2b3ef..81acf9e 100644
--- a/radio/IRadioService.cpp
+++ b/radio/IRadioService.cpp
@@ -87,7 +87,8 @@
         data.writeInterfaceToken(IRadioService::getInterfaceDescriptor());
         data.writeInt32(handle);
         data.writeStrongBinder(IInterface::asBinder(client));
-        ALOGV("attach() config %p withAudio %d region %d type %d", config, withAudio, config->region, config->band.type);
+        ALOGV("attach() config %p withAudio %d region %d type %d",
+              config == NULL ? 0 : config, withAudio, config->region, config->band.type);
         if (config == NULL) {
             data.writeInt32(0);
         } else {

services/radio/RadioService.cpp

diff --git a/services/radio/RadioService.cpp b/services/radio/RadioService.cpp
index cd0f5f3..57697f3 100644
--- a/services/radio/RadioService.cpp
+++ b/services/radio/RadioService.cpp
@@ -349,6 +349,7 @@
         }
         break;
     case RADIO_EVENT_TA:
+    case RADIO_EVENT_EA:
     case RADIO_EVENT_ANTENNA:
     case RADIO_EVENT_CONTROL:
         event->on = halEvent->on;