Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53298287 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Always specify underlying enum type." am: 832f1a79 am: e50a914c 

am: da6eba78

Change-Id: Iaaa659c72a41574508aff113797fd429b7426b3e
parents 98474e75 da6eba78

tests/baz/1.0/IBase.hal

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ interface IExpression { 
    MAX_PLUS_2 // 1

  };



  enum Constants {

  enum Constants : int32_t {

    CONST_FOO,

    CONST_BAR = 70,

    MAX_ARRAY_SIZE = 20,

wifi/1.0/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ struct StaScanResult { 
/**

 * 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.