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

Commit 832f1a79 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Always specify underlying enum type."

parents 13be232d 73600f79

tests/baz/1.0/IBase.hal

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.hardware.tests.baz@1.0;

package android.hardware.tests.baz@1.0;





interface IBase {

interface IBase {

    enum SomeBaseEnum {

    enum SomeBaseEnum : int32_t {

        grrr = 1,

        grrr = 1,

    };

    };

tests/expression/1.0/IExpression.hal

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

    MAX_PLUS_2 // 1

  };

  };





  enum Constants {

  enum Constants : int32_t {

    CONST_FOO,

    CONST_FOO,

    CONST_BAR = 70,

    CONST_BAR = 70,

    MAX_ARRAY_SIZE = 20,

    MAX_ARRAY_SIZE = 20,

wifi/1.0/types.hal

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

/**

 * Mask of flags set in the |ScanData| instance.

 * 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

   * Indicates that a scan was interrupted/did not occur so results may be

   * incomplete.

   * incomplete.