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

Commit d05e4b31 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[AWARE] Add global NAN RTT enable/disable flag"

parents 35ba1b5a 4f5bc6cc

wifi/1.2/default/hidl_struct_util.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -1141,6 +1141,8 @@ bool convertHidlNanEnableRequest_1_2ToLegacy( 
    legacy_request->config_dw_early_termination = 1;

    legacy_request->config_dw_early_termination = 1;

    legacy_request->enable_dw_termination =

    legacy_request->enable_dw_termination =

        hidl_request2.enableDiscoveryWindowEarlyTermination;

        hidl_request2.enableDiscoveryWindowEarlyTermination;

    legacy_request->config_enable_ranging = 1;

    legacy_request->enable_ranging = hidl_request2.enableRanging;





    return true;

    return true;

}

}
@@ -1650,6 +1652,8 @@ bool convertHidlNanConfigRequest_1_2ToLegacy( 
    legacy_request->config_dw_early_termination = 1;

    legacy_request->config_dw_early_termination = 1;

    legacy_request->enable_dw_termination =

    legacy_request->enable_dw_termination =

        hidl_request2.enableDiscoveryWindowEarlyTermination;

        hidl_request2.enableDiscoveryWindowEarlyTermination;

    legacy_request->config_enable_ranging = 1;

    legacy_request->enable_ranging = hidl_request2.enableRanging;





    return true;

    return true;

}

}

wifi/1.2/types.hal

+5 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,11 @@ struct NanConfigRequestSupplemental { 
     * lower power consumption, but may result in some missed messages and hence increased latency.

     * lower power consumption, but may result in some missed messages and hence increased latency.

     */

     */

    bool enableDiscoveryWindowEarlyTermination;

    bool enableDiscoveryWindowEarlyTermination;

    /**

     * Controls whether NAN RTT (ranging) is permitted. Global flag on any NAN RTT operations are

     * allowed. Controls ranging in the context of discovery as well as direct RTT.

     */

    bool enableRanging;

};

};





/**

/**