commit 92047ec34ba7339ff1b99ede8e483cc2f64d436c
author Marco Nelissen <marcone@google.com> Fri Oct 14 14:49:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 14 14:49:24 2016 +0000
tree 9e8a6562070f676b8c51e38ab6f490d7cb584764
parent 4065e775e643faa71102aa644acf8f93731e0b0c
parent c3fe699d319ee040515a230dc94e7cf50c95c05a

Merge "Fix issues with metadata handling when format change happens"

media/libcpustats/Android.mk

diff --git a/media/libcpustats/Android.mk b/media/libcpustats/Android.mk
index 57fe527..b2d73ee 100644
--- a/media/libcpustats/Android.mk
+++ b/media/libcpustats/Android.mk
@@ -8,6 +8,6 @@
 
 LOCAL_MODULE := libcpustats
 
-LOCAL_CFLAGS := -std=gnu++11 -Werror -Wall
+LOCAL_CFLAGS := -Werror -Wall
 
 include $(BUILD_STATIC_LIBRARY)

radio/IRadioService.cpp

diff --git a/radio/IRadioService.cpp b/radio/IRadioService.cpp
index 960aab4..be7d21e 100644
--- a/radio/IRadioService.cpp
+++ b/radio/IRadioService.cpp
@@ -88,7 +88,9 @@
         data.writeInt32(handle);
         data.writeStrongBinder(IInterface::asBinder(client));
         ALOGV("attach() config %p withAudio %d region %d type %d",
-              config == NULL ? 0 : config, withAudio, config->region, config->band.type);
+              config == NULL ? 0 : config, withAudio,
+              config == NULL ? 0 : config->region,
+              config == NULL ? 0 : config->band.type);
         if (config == NULL) {
             data.writeInt32(0);
         } else {