commit 0a32461524f55697cdc49baa5c26c95839f4b52a
author Paul Lawrence <paullawrence@google.com> Wed Mar 19 14:47:29 2014 -0700
committer Todd Poynor <toddpoynor@google.com> Fri Mar 21 19:22:37 2014 +0000
tree a37b21c43bb3f491bbd529a75148829fb95ebc0a
parent b898440c99bc3800b427f166d12b003e8aa534e2

batteryservice: Native client read exception returned from getProperty

C++ binder client for IBatteryPropertiesRegistrar interface getProperty method
fails to read the exception code returned by the server.  Add the missing read of the exception code.

Bug: 11985952
Change-Id: I8a9b145160aafbcf9976e6c5ba9fcb883126a5e3

services/batteryservice/IBatteryPropertiesRegistrar.cpp

diff --git a/services/batteryservice/IBatteryPropertiesRegistrar.cpp b/services/batteryservice/IBatteryPropertiesRegistrar.cpp
index 6647122..296bfab 100644
--- a/services/batteryservice/IBatteryPropertiesRegistrar.cpp
+++ b/services/batteryservice/IBatteryPropertiesRegistrar.cpp
@@ -50,7 +50,11 @@
             data.writeInterfaceToken(IBatteryPropertiesRegistrar::getInterfaceDescriptor());
             data.writeInt32(id);
             remote()->transact(GET_PROPERTY, data, &reply);
-            status_t ret = reply.readInt32();
+            int32_t ret = reply.readExceptionCode();
+            if (ret != 0) {
+                return ret;
+            }
+            ret = reply.readInt32();
             int parcelpresent = reply.readInt32();
             if (parcelpresent)
                 val->readFromParcel(&reply);