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

Commit 0e05439d authored by Biswarup Pal's avatar Biswarup Pal Committed by Android (Google) Code Review
Browse files

Merge "Add suspendable option in NanDiscoveryCommonConfig"

parents e3d6ae8e 11921783

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

+1 −0
Original line number Diff line number Diff line
@@ -54,4 +54,5 @@ parcelable NanDiscoveryCommonConfig { 
  android.hardware.wifi.NanRangingIndication configRangingIndications;

  char distanceIngressCm;

  char distanceEgressCm;

  boolean enableSessionSuspendability;

}

wifi/aidl/android/hardware/wifi/NanDiscoveryCommonConfig.aidl

+6 −0
Original line number Diff line number Diff line
@@ -155,4 +155,10 @@ parcelable NanDiscoveryCommonConfig { 
     */

    char distanceIngressCm;

    char distanceEgressCm;

    /**

     * Specifies whether suspension can be possible in this discovery session.

     * The request would fail if |enableSessionSuspendability| is true but

     * |NanCapabilities.supportsSuspension| is false.

     */

    boolean enableSessionSuspendability;

}

wifi/aidl/default/aidl_struct_util.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1850,6 +1850,7 @@ bool convertAidlNanPublishRequestToLegacy(const NanPublishRequest& aidl_request, 
        LOG(ERROR) << "convertAidlNanPublishRequestToLegacy: invalid pairing config";

        return false;

    }

    legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability;



    return true;

}
@@ -1996,6 +1997,8 @@ bool convertAidlNanSubscribeRequestToLegacy(const NanSubscribeRequest& aidl_requ 
        LOG(ERROR) << "convertAidlNanSubscribeRequestToLegacy: invalid pairing config";

        return false;

    }

    legacy_request->enable_suspendability = aidl_request.baseConfigs.enableSessionSuspendability;



    return true;

}