commit 8ce84699e7a425f93012ef1eefff473c5f55d33a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 19 19:36:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 19 19:36:17 2018 +0000
tree 636cc74fd487c82801ed96d3f856681e7a10141b
parent d05e4b31f4a953cb2a43ab1b524d51f0bc92baec
parent 256929827a98b5bfa612ab8885ed23552d8e316e

Merge "Move KeyParameter operator== to support lib."

current.txt

diff --git a/current.txt b/current.txt
index c18153a..a5ab307 100644
--- a/current.txt
+++ b/current.txt
@@ -255,4 +255,4 @@
 fb92e2b40f8e9d494e8fd3b4ac18499a3216342e7cff160714c3bbf3660b6e79 android.hardware.gnss@1.0::IGnssConfiguration
 251594ea9b27447bfa005ebd806e58fb0ae4aad84a69938129c9800ec0c64eda android.hardware.gnss@1.0::IGnssMeasurementCallback
 4e7169919d24fbe5573e5bcd683d0bd7abf553a4e6c34c41f9dfc1e12050db07 android.hardware.gnss@1.0::IGnssNavigationMessageCallback
-
+b280c4704dfcc548a9bf127b59b7c3578f460c50cce70a06b66fe0df8b27cff0 android.hardware.wifi@1.0::types

wifi/1.0/types.hal

diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal
index b9fb0bd..4b8d68a 100644
--- a/wifi/1.0/types.hal
+++ b/wifi/1.0/types.hal
@@ -1411,7 +1411,8 @@
   vec<uint8_t> extendedServiceSpecificInfo;
   /**
    * The match filter from the discovery packet (publish or subscribe) which caused service
-   * discovery. Matches the peer's |NanDiscoveryCommonConfig.txMatchFilter|.
+   * discovery. Matches the |NanDiscoveryCommonConfig.txMatchFilter| of the peer's Unsolicited
+   * publish message or of the local device's Active subscribe message.
    * Max length: |NanCapabilities.maxMatchFilterLen|.
    * NAN Spec: Service Descriptor Attribute (SDA) / Matching Filter
    */

wifi/1.2/default/hidl_struct_util.cpp

diff --git a/wifi/1.2/default/hidl_struct_util.cpp b/wifi/1.2/default/hidl_struct_util.cpp
index 3ca35f7..f87828c 100644
--- a/wifi/1.2/default/hidl_struct_util.cpp
+++ b/wifi/1.2/default/hidl_struct_util.cpp
@@ -1141,6 +1141,8 @@
     legacy_request->config_dw_early_termination = 1;
     legacy_request->enable_dw_termination =
         hidl_request2.enableDiscoveryWindowEarlyTermination;
+    legacy_request->config_enable_ranging = 1;
+    legacy_request->enable_ranging = hidl_request2.enableRanging;
 
     return true;
 }
@@ -1650,6 +1652,8 @@
     legacy_request->config_dw_early_termination = 1;
     legacy_request->enable_dw_termination =
         hidl_request2.enableDiscoveryWindowEarlyTermination;
+    legacy_request->config_enable_ranging = 1;
+    legacy_request->enable_ranging = hidl_request2.enableRanging;
 
     return true;
 }

wifi/1.2/types.hal

diff --git a/wifi/1.2/types.hal b/wifi/1.2/types.hal
index 60f4b1f..1636ae8 100644
--- a/wifi/1.2/types.hal
+++ b/wifi/1.2/types.hal
@@ -49,6 +49,11 @@
      * lower power consumption, but may result in some missed messages and hence increased latency.
      */
     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;
 };
 
 /**