commit 433c8bbdfa1ee6db10b7f08d3c50eafd49ad2687
author Christopher Wiley <wiley@google.com> Thu Nov 12 14:20:46 2015 -0800
committer Christopher Wiley <wiley@google.com> Wed Nov 18 08:30:59 2015 -0800
tree 3e98dadbdbb49f8992d2f1bd973b1d2490c66089
parent 82572c5c37966e0a6b340e2b15b8b109de6f2e8e

Implement error handling for C++ services

Bug: 25615695
Test: unit tests continue to pass.

Change-Id: I24f4f3a5a7b95438ab7daa707d2b4598b33b8302

tests/aidl_test_client.cpp

diff --git a/tests/aidl_test_client.cpp b/tests/aidl_test_client.cpp
index 211d0fa..c3ae443 100644
--- a/tests/aidl_test_client.cpp
+++ b/tests/aidl_test_client.cpp
@@ -35,6 +35,7 @@
 // libbinder:
 using android::getService;
 using android::IBinder;
+using android::binder::Status;
 
 // generated
 using android::aidl::tests::ITestService;
@@ -62,12 +63,13 @@
 
 template <typename T>
 bool RepeatPrimitive(const sp<ITestService>& service,
-                     status_t(ITestService::*func)(T, T*),
+                     Status(ITestService::*func)(T, T*),
                      const T input) {
   T reply;
-  status_t status = (*service.*func)(input, &reply);
-  if (status != OK || input != reply) {
-    cerr << "Failed to repeat primitive. status=" << status << "." << endl;
+  Status status = (*service.*func)(input, &reply);
+  if (!status.isOk() || input != reply) {
+    cerr << "Failed to repeat primitive. status=" << status.toString8()
+         << "." << endl;
     return false;
   }
   return true;
@@ -93,11 +95,11 @@
   };
   for (const auto& input : inputs) {
     String16 reply;
-    status_t status = s->RepeatString(input, &reply);
-    if (status != OK || input != reply) {
+    Status status = s->RepeatString(input, &reply);
+    if (!status.isOk() || input != reply) {
       cerr << "Failed while requesting service to repeat String16=\""
            << String8(input).string()
-           << "\". Got status=" << status << endl;
+           << "\". Got status=" << status.toString8() << endl;
       return false;
     }
   }
@@ -106,15 +108,16 @@
 
 template <typename T>
 bool ReverseArray(const sp<ITestService>& service,
-                  status_t(ITestService::*func)(const vector<T>&,
-                                                vector<T>*,
-                                                vector<T>*),
+                  Status(ITestService::*func)(const vector<T>&,
+                                              vector<T>*,
+                                              vector<T>*),
                   vector<T> input) {
   vector<T> actual_reversed;
   vector<T> actual_repeated;
-  status_t status = (*service.*func)(input, &actual_repeated, &actual_reversed);
-  if (status != OK) {
-    cerr << "Failed to repeat array. status=" << status << "." << endl;
+  Status status = (*service.*func)(input, &actual_repeated, &actual_reversed);
+  if (!status.isOk()) {
+    cerr << "Failed to repeat array. status=" << status.toString8() << "."
+         << endl;
     return false;
   }
   if (input != actual_repeated) {
@@ -168,7 +171,7 @@
 }
 
 bool ConfirmReverseBinderLists(const sp<ITestService>& s) {
-  status_t status;
+  Status status;
   cout << "Confirming passing and returning List<T> works with binders." << endl;
 
   vector<String16> names = {
@@ -183,7 +186,7 @@
     sp<INamedCallback> got;
 
     status = s->GetOtherTestService(names[i], &got);
-    if (status != OK) {
+    if (!status.isOk()) {
       cerr << "Could not retrieve service for test." << endl;
       return false;
     }
@@ -195,6 +198,9 @@
   vector<sp<IBinder>> reversed;
 
   status = s->ReverseNamedCallbackList(input, &output, &reversed);
+  if (!status.isOk()) {
+    cerr << "Failed to reverse named callback list." << endl;
+  }
 
   if (output.size() != 3) {
     cerr << "ReverseNamedCallbackList gave repetition with wrong length." << endl;
@@ -212,7 +218,7 @@
         android::interface_cast<INamedCallback>(output[i]);
     status = named_callback->GetName(&ret);
 
-    if (status != OK) {
+    if (!status.isOk()) {
       cerr << "Could not query INamedCallback from output" << endl;
       return false;
     }
@@ -229,7 +235,7 @@
         android::interface_cast<INamedCallback>(reversed[i]);
     status = named_callback->GetName(&ret);
 
-    if (status != OK) {
+    if (!status.isOk()) {
       cerr << "Could not query INamedCallback from reversed output" << endl;
       return false;
     }