commit ddf9401aa984eeb8cc4abd3eaa460e4c4d8af024
author Quang Luong <qal@google.com> Tue Jan 19 17:01:08 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 19 17:01:08 2021 +0000
tree 663e0a5981a6e2c1deaa0544e626a598f346c418
parent 9ff6580fbd563fe216c24c7d900dc323ca3b3164
parent 3000a60c2abd3d1e4f64e6c141d6759eaa7c7931

Merge "Fix 1.5::WifiBand inheritance"

wifi/1.5/types.hal

diff --git a/wifi/1.5/types.hal b/wifi/1.5/types.hal
index 3fbec82..9fa5c80 100644
--- a/wifi/1.5/types.hal
+++ b/wifi/1.5/types.hal
@@ -19,7 +19,7 @@
 import @1.0::StaLinkLayerIfaceStats;
 import @1.0::StaLinkLayerIfacePacketStats;
 import @1.0::TimeStampInMs;
-import @1.0::WifiBand;
+import @1.4::WifiBand;
 import @1.0::NanCipherSuiteType;
 import @1.0::NanCapabilities;
 import @1.2::NanConfigRequestSupplemental;
@@ -28,7 +28,7 @@
 /**
  * Wifi bands defined in 80211 spec.
  */
-enum WifiBand : @1.0::WifiBand {
+enum WifiBand : @1.4::WifiBand {
     /**
      * 60 GHz.
      */