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

Commit f7b018dc authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Data-path negotiation update" am: a4b9cad4 

am: b4c9402e

Change-Id: Ib6c1ef62a2819a76095989217f5d8d6bb091bb4b
parents 93b79bd1 b4c9402e

wifi/1.0/default/hidl_struct_util.cpp

+2 −0
Original line number Diff line number Diff line
@@ -973,6 +973,8 @@ bool convertHidlNanPublishRequestToLegacy( 
  legacy_request->range_report = legacy_hal::NAN_DISABLE_RANGE_REPORT;

  legacy_request->publish_type = (legacy_hal::NanPublishType) hidl_request.publishType;

  legacy_request->tx_type = (legacy_hal::NanTxType) hidl_request.txType;

  legacy_request->service_responder_policy = hidl_request.autoAcceptDataPathRequests ?

        legacy_hal::NAN_SERVICE_ACCEPT_POLICY_ALL : legacy_hal::NAN_SERVICE_ACCEPT_POLICY_NONE;



  return true;

}

wifi/1.0/default/wifi_nan_iface.cpp

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ WifiNanIface::WifiNanIface( 
            LOG(ERROR) << "Failed to invoke the callback";

          }

        }

        break;

    }

    case legacy_hal::NAN_DP_END: {

        for (const auto& callback : shared_ptr_this->getEventCallbacks()) {

wifi/1.0/types.hal

+7 −0
Original line number Diff line number Diff line
@@ -1062,6 +1062,13 @@ struct NanPublishRequest { 
   * peer.

   */

  NanTxType txType;

  /**

   * Specifies whether data-path requests |IWifiNanIfaceEventCallback.eventDataPathRequest| (in

   * the context of this discovery session) are automatically accepted (if true) - in which case

   * the Responder must not call the |IWifiNanIface.respondToDataPathIndicationRequest| method and

   * the device must automatically accept the data-path request and complete the negotiation.

   */

  bool autoAcceptDataPathRequests;

};



/**