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

Commit 53368fa3 authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge changes from topic "vendor-hal-bitmaps" into udc-dev 

* changes:
  Update Vendor HAL service to use ints for bitmaps instead of using enums.
  Use an int to represent bitmaps in the Vendor HAL AIDL interface.
parents d84b70df 3b86a780

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiChip.aidl

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ interface IWifiChip { 
  @PropagateAllowBlocking android.hardware.wifi.IWifiApIface getApIface(in String ifname);

  String[] getApIfaceNames();

  android.hardware.wifi.IWifiChip.ChipMode[] getAvailableModes();

  android.hardware.wifi.IWifiChip.ChipCapabilityMask getCapabilities();

  int getCapabilities();

  android.hardware.wifi.WifiDebugHostWakeReasonStats getDebugHostWakeReasonStats();

  android.hardware.wifi.WifiDebugRingBufferStatus[] getDebugRingBuffersStatus();

  int getId();
@@ -60,7 +60,7 @@ interface IWifiChip { 
  String[] getStaIfaceNames();

  android.hardware.wifi.WifiRadioCombination[] getSupportedRadioCombinations();

  android.hardware.wifi.WifiChipCapabilities getWifiChipCapabilities();

  android.hardware.wifi.WifiUsableChannel[] getUsableChannels(in android.hardware.wifi.WifiBand band, in android.hardware.wifi.WifiIfaceMode ifaceModeMask, in android.hardware.wifi.IWifiChip.UsableChannelFilter filterMask);

  android.hardware.wifi.WifiUsableChannel[] getUsableChannels(in android.hardware.wifi.WifiBand band, in int ifaceModeMask, in int filterMask);

  void setAfcChannelAllowance(in android.hardware.wifi.AvailableAfcFrequencyInfo[] availableAfcFrequencyInfo);

  void registerEventCallback(in android.hardware.wifi.IWifiChipEventCallback callback);

  void removeApIface(in String ifname);
@@ -73,7 +73,7 @@ interface IWifiChip { 
  byte[] requestFirmwareDebugDump();

  void resetTxPowerScenario();

  void selectTxPowerScenario(in android.hardware.wifi.IWifiChip.TxPowerScenario scenario);

  void setCoexUnsafeChannels(in android.hardware.wifi.IWifiChip.CoexUnsafeChannel[] unsafeChannels, in android.hardware.wifi.IWifiChip.CoexRestriction restrictions);

  void setCoexUnsafeChannels(in android.hardware.wifi.IWifiChip.CoexUnsafeChannel[] unsafeChannels, in int restrictions);

  void setCountryCode(in byte[2] code);

  void setLatencyMode(in android.hardware.wifi.IWifiChip.LatencyMode mode);

  void setMultiStaPrimaryConnection(in String ifName);
@@ -81,7 +81,7 @@ interface IWifiChip { 
  void startLoggingToDebugRingBuffer(in String ringName, in android.hardware.wifi.WifiDebugRingBufferVerboseLevel verboseLevel, in int maxIntervalInSec, in int minDataSizeInBytes);

  void stopLoggingToDebugRingBuffer();

  void triggerSubsystemRestart();

  void enableStaChannelForPeerNetwork(in android.hardware.wifi.IWifiChip.ChannelCategoryMask channelCategoryEnableFlag);

  void enableStaChannelForPeerNetwork(in int channelCategoryEnableFlag);

  void setMloMode(in android.hardware.wifi.IWifiChip.ChipMloMode mode);

  const int NO_POWER_CAP_CONSTANT = 0x7FFFFFFF;

  @Backing(type="int") @VintfStability

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ interface IWifiStaIface { 
  void enableNdOffload(in boolean enable);

  android.hardware.wifi.StaApfPacketFilterCapabilities getApfPacketFilterCapabilities();

  android.hardware.wifi.StaBackgroundScanCapabilities getBackgroundScanCapabilities();

  android.hardware.wifi.IWifiStaIface.StaIfaceCapabilityMask getCapabilities();

  int getCapabilities();

  android.hardware.wifi.WifiDebugRxPacketFateReport[] getDebugRxPacketFates();

  android.hardware.wifi.WifiDebugTxPacketFateReport[] getDebugTxPacketFates();

  byte[6] getFactoryMacAddress();

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaBackgroundScanBucketParameters.aidl

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ parcelable StaBackgroundScanBucketParameters { 
  android.hardware.wifi.WifiBand band;

  int[] frequencies;

  int periodInMs;

  android.hardware.wifi.StaBackgroundScanBucketEventReportSchemeMask eventReportScheme;

  int eventReportScheme;

  int exponentialMaxPeriodInMs;

  int exponentialBase;

  int exponentialStepCount;

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaScanData.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.wifi;

@VintfStability

parcelable StaScanData {

  android.hardware.wifi.StaScanDataFlagMask flags;

  int flags;

  int bucketsScanned;

  android.hardware.wifi.StaScanResult[] results;

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiUsableChannel.aidl

+1 −1
Original line number Diff line number Diff line
@@ -36,5 +36,5 @@ package android.hardware.wifi; 
parcelable WifiUsableChannel {

  int channel;

  android.hardware.wifi.WifiChannelWidthInMhz channelBandwidth;

  android.hardware.wifi.WifiIfaceMode ifaceModeMask;

  int ifaceModeMask;

}