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

Commit d1ae25e4 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "wifi: Duplicate getValidChannelsForBand in AP iface" 

am: d8328b68

Change-Id: I619184ede20560f8f2209c95d948cd0e33066302
parents d570e59b d8328b68

wifi/1.0/Android.mk

+38 −38
Original line number Diff line number Diff line
@@ -795,25 +795,6 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (StaBackgroundScanBand)

#

GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBand.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.wifi@1.0::types.StaBackgroundScanBand



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (StaBackgroundScanBucketEventReportSchemeMask)

#
@@ -1080,6 +1061,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (WifiBand)

#

GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiBand.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.wifi@1.0::types.WifiBand



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (WifiChannelInfo)

#
@@ -2598,25 +2598,6 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (StaBackgroundScanBand)

#

GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBand.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.wifi@1.0::types.StaBackgroundScanBand



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (StaBackgroundScanBucketEventReportSchemeMask)

#
@@ -2883,6 +2864,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (WifiBand)

#

GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiBand.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.wifi@1.0::types.WifiBand



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (WifiChannelInfo)

#

wifi/1.0/IWifiApIface.hal

+17 −0
Original line number Diff line number Diff line
@@ -33,4 +33,21 @@ interface IWifiApIface extends IWifiIface { 
   *         |WifiStatusCode.FAILURE_IFACE_INVALID|

   */

  setCountryCode(int8_t[2] code) generates (WifiStatus status);



  /**

   * Used to query the list of valid frequencies (depending on country code set)

   * for the provided band.

   *

   * @param band Band for which the frequency list is being generated.

   * @return status WifiStatus of the operation.

   *         Possible status codes:

   *         |WifiStatusCode.SUCCESS|,

   *         |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,

   *         |WifiStatusCode.ERROR_NOT_SUPPORTED|,

   *         |WifiStatusCode.ERROR_NOT_AVAILABLE|,

   *         |WifiStatusCode.ERROR_UNKNOWN|

   * @return frequencies vector of valid frequencies for the provided band.

   */

  getValidFrequenciesForBand(WifiBand band)

      generates (WifiStatus status, vec<WifiChannelInMhz> frequencies);

};

wifi/1.0/IWifiStaIface.hal

+1 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ interface IWifiStaIface extends IWifiIface { 
   * for the provided band. These channels may be specifed in the

   * |BackgroundScanBucketParameters.frequenciesInMhz| for a background scan

   * request.

   * Must fail if |StaIfaceCapabilityMask.BACKGROUND_SCAN| is not set.

   *

   * @param band Band for which the frequency list is being generated.

   * @return status WifiStatus of the operation.
@@ -192,7 +191,7 @@ interface IWifiStaIface extends IWifiIface { 
   *         |WifiStatusCode.ERROR_UNKNOWN|

   * @return frequencies vector of valid frequencies for the provided band.

   */

  getValidFrequenciesForBackgroundScan(StaBackgroundScanBand band)

  getValidFrequenciesForBand(WifiBand band)

      generates (WifiStatus status, vec<WifiChannelInMhz> frequencies);



  /**

wifi/1.0/default/hidl_callback_util.h

+3 −5
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ class HidlCallbackHandler { 
    return true;

  }



  const std::set<android::sp<CallbackType>> getCallbacks() {

    return cb_set_;

  }

  const std::set<android::sp<CallbackType>> getCallbacks() { return cb_set_; }



  // Death notification for callbacks.

  void onObjectDeath(uint64_t cookie) {

wifi/1.0/default/hidl_struct_util.cpp

+8 −8
Original line number Diff line number Diff line
@@ -306,21 +306,21 @@ bool convertLegacyGscanCapabilitiesToHidl( 
  return true;

}



legacy_hal::wifi_band convertHidlGscanBandToLegacy(StaBackgroundScanBand band) {

legacy_hal::wifi_band convertHidlWifiBandToLegacy(WifiBand band) {

  switch (band) {

    case StaBackgroundScanBand::BAND_UNSPECIFIED:

    case WifiBand::BAND_UNSPECIFIED:

      return legacy_hal::WIFI_BAND_UNSPECIFIED;

    case StaBackgroundScanBand::BAND_24GHZ:

    case WifiBand::BAND_24GHZ:

      return legacy_hal::WIFI_BAND_BG;

    case StaBackgroundScanBand::BAND_5GHZ:

    case WifiBand::BAND_5GHZ:

      return legacy_hal::WIFI_BAND_A;

    case StaBackgroundScanBand::BAND_5GHZ_DFS:

    case WifiBand::BAND_5GHZ_DFS:

      return legacy_hal::WIFI_BAND_A_DFS;

    case StaBackgroundScanBand::BAND_5GHZ_WITH_DFS:

    case WifiBand::BAND_5GHZ_WITH_DFS:

      return legacy_hal::WIFI_BAND_A_WITH_DFS;

    case StaBackgroundScanBand::BAND_24GHZ_5GHZ:

    case WifiBand::BAND_24GHZ_5GHZ:

      return legacy_hal::WIFI_BAND_ABG;

    case StaBackgroundScanBand::BAND_24GHZ_5GHZ_WITH_DFS:

    case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS:

      return legacy_hal::WIFI_BAND_ABG_WITH_DFS;

  };

  CHECK(false);