commit 5329acb61f7a04be275aa25c04e022fc1a8c54da
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 01 20:55:37 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 01 20:55:39 2016 +0000
tree ba3d14f4101cd751be8739135306958c9647dae1
parent 832f1a797890ff2923b7ed47a2c010aa20a24423
parent fafbbd7026dc48054f3c68b0484b3ffa972d7ab6

Merge "Revert "Use get instead of implicit cast on Return<*>.""

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,

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.