commit 786c00d72ed9b89ce37b50b6140865f23374c063
author Roshan Pius <rpius@google.com> Fri Dec 02 20:29:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 02 20:29:01 2016 +0000
tree c375d5038e489393b7006b11f27c9a94afcd7d55
parent 3ff50102edbeb84727200f2fc0efd31366346a2b
parent a4854ff317d57d2bb1c901152cbddd31bf7a48a8

Merge "wifi: Don't include legacy hal header in wifi_status_util"

boot/1.0/default/BootControl.cpp

diff --git a/boot/1.0/default/BootControl.cpp b/boot/1.0/default/BootControl.cpp
index 4c34168..87f36ed 100644
--- a/boot/1.0/default/BootControl.cpp
+++ b/boot/1.0/default/BootControl.cpp
@@ -1,5 +1,5 @@
 #define LOG_TAG "android.hardware.boot@1.0-impl"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/boot_control.h>

nfc/1.0/default/Nfc.cpp

diff --git a/nfc/1.0/default/Nfc.cpp b/nfc/1.0/default/Nfc.cpp
index bee374d..44c8e42 100644
--- a/nfc/1.0/default/Nfc.cpp
+++ b/nfc/1.0/default/Nfc.cpp
@@ -1,5 +1,5 @@
 #define LOG_TAG "android.hardware.nfc@1.0-impl"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <hardware/hardware.h>
 #include <hardware/nfc.h>

tests/baz/1.0/IBase.hal

diff --git a/tests/baz/1.0/IBase.hal b/tests/baz/1.0/IBase.hal
index add4153..7f90f16 100644
--- a/tests/baz/1.0/IBase.hal
+++ b/tests/baz/1.0/IBase.hal
@@ -17,7 +17,7 @@
 package android.hardware.tests.baz@1.0;
 
 interface IBase {
-    enum SomeBaseEnum {
+    enum SomeBaseEnum : int32_t {
         grrr = 1,
     };
 

tests/expression/1.0/IExpression.hal

diff --git a/tests/expression/1.0/IExpression.hal b/tests/expression/1.0/IExpression.hal
index a44e03c..6eb5b2a 100644
--- a/tests/expression/1.0/IExpression.hal
+++ b/tests/expression/1.0/IExpression.hal
@@ -178,7 +178,7 @@
     MAX_PLUS_2 // 1
   };
 
-  enum Constants {
+  enum Constants : int32_t {
     CONST_FOO,
     CONST_BAR = 70,
     MAX_ARRAY_SIZE = 20,

tests/foo/1.0/default/Foo.cpp

diff --git a/tests/foo/1.0/default/Foo.cpp b/tests/foo/1.0/default/Foo.cpp
index 5a51532..850d716 100644
--- a/tests/foo/1.0/default/Foo.cpp
+++ b/tests/foo/1.0/default/Foo.cpp
@@ -112,16 +112,7 @@
                   << DELAY_S
                   << " seconds";
         c[1] = systemTime();
-        Return<bool> ret = cb->heyItsYouIsntIt(cb);
-        if (!ret.isOk()) {
-            LOG(ERROR) << "SERVER(Foo) callMe "
-                      << cb.get()
-                      << " encountered transport error ("
-                      << ret.getStatus().exceptionCode()
-                      << ").";
-            return Void();
-        }
-        bool answer = ret.get();
+        bool answer = cb->heyItsYouIsntIt(cb);
         c[1] = systemTime() - c[1];
 
         LOG(INFO) << "SERVER(Foo) callMe "

wifi/1.0/types.hal

diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal
index 066662c..9e53377 100644
--- a/wifi/1.0/types.hal
+++ b/wifi/1.0/types.hal
@@ -486,7 +486,7 @@
 /**
  * Mask of flags set in the |ScanData| instance.
  */
-enum StaScanDataFlagMask {
+enum StaScanDataFlagMask : int32_t {
   /**
    * Indicates that a scan was interrupted/did not occur so results may be
    * incomplete.