Merge "Add low latency offbody detect sensor type"
diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp
index 3718503..19b1388 100644
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -1,15 +1,4 @@
-genrule {
- name: "android.hardware.graphics.mapper@2.0_genc++_headers",
- cmd: "cp $in $genDir/android/hardware/graphics/mapper/2.0",
- srcs: ["IMapper.h", "types.h"],
- out: [
- "android/hardware/graphics/mapper/2.0/IMapper.h",
- "android/hardware/graphics/mapper/2.0/types.h",
- ],
-}
-
cc_library_static {
name: "android.hardware.graphics.mapper@2.0",
- generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"],
+ export_include_dirs: ["include"],
}
diff --git a/graphics/mapper/2.0/IMapper.h b/graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/IMapper.h
similarity index 100%
rename from graphics/mapper/2.0/IMapper.h
rename to graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/IMapper.h
diff --git a/graphics/mapper/2.0/types.h b/graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/types.h
similarity index 100%
rename from graphics/mapper/2.0/types.h
rename to graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/types.h
diff --git a/vr/1.0/vts/Android.mk b/vr/1.0/vts/Android.mk
new file mode 100644
index 0000000..3c45652
--- /dev/null
+++ b/vr/1.0/vts/Android.mk
@@ -0,0 +1,85 @@
+#
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+# build VTS driver for Vr v1.0.
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libvts_driver_hidl_vr@1.0
+
+LOCAL_SRC_FILES := \
+ Vr.vts \
+
+LOCAL_C_INCLUDES := \
+ android.hardware.vr@1.0 \
+ system/core/base/include \
+ system/core/include \
+
+LOCAL_SHARED_LIBRARIES += \
+ android.hardware.vr@1.0 \
+ libbase \
+ libutils \
+ libcutils \
+ liblog \
+ libhidl \
+ libhwbinder \
+ libprotobuf-cpp-full \
+ libvts_common \
+ libvts_datatype \
+ libvts_measurement \
+ libvts_multidevice_proto \
+
+LOCAL_CFLAGS += -DENABLE_TREBLE
+
+LOCAL_STATIC_LIBRARIES := \
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := full
+
+LOCAL_MULTILIB := both
+
+include $(BUILD_SHARED_LIBRARY)
+
+# build profiler for Vr.
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libvts_profiler_hidl_vr@1.0
+
+LOCAL_SRC_FILES := \
+ Vr.vts \
+
+LOCAL_C_INCLUDES += \
+ test/vts/drivers/libprofiling \
+
+LOCAL_VTS_MODE := PROFILER
+
+LOCAL_SHARED_LIBRARIES := \
+ android.hardware.vr@1.0 \
+ libbase \
+ libcutils \
+ liblog \
+ libhidl \
+ libhwbinder \
+ libprotobuf-cpp-full \
+ libvts_common \
+ libvts_multidevice_proto \
+ libvts_profiling \
+ libutils \
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := full
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/wifi/supplicant/1.0/ISupplicant.hal b/wifi/supplicant/1.0/ISupplicant.hal
index c0131c5..64bbd7b 100644
--- a/wifi/supplicant/1.0/ISupplicant.hal
+++ b/wifi/supplicant/1.0/ISupplicant.hal
@@ -20,13 +20,13 @@
import ISupplicantIface;
/**
- * Interface exposed by the wpa_supplicant HIDL service registered
+ * Interface exposed by the supplicant HIDL service registered
* with the hardware service manager.
- * This is the root level object for any wpa_supplicant interactions.
+ * This is the root level object for any the supplicant interactions.
*/
interface ISupplicant {
/**
- * Debug levels for wpa_supplicant.
+ * Debug levels for the supplicant.
* Only log messages with a level greater than the set level
* (via |setDebugParams|) will be logged.
*/
@@ -41,7 +41,7 @@
/**
* Structure describing the type and name of an iface
- * controlled by wpa_supplicant.
+ * controlled by the supplicant.
*/
struct IfaceInfo {
/**
@@ -56,7 +56,7 @@
/**
* Gets a HIDL interface object for the interface corresponding to iface
- * name which wpa_supplicant already controls.
+ * name which the supplicant already controls.
*
* @param ifaceInfo Combination of the iface type and name retrieved
* using |listInterfaces|.
@@ -72,7 +72,7 @@
generates (SupplicantStatus status, ISupplicantIface iface);
/**
- * Retrieve a list of all the interfaces controlled by wpa_supplicant.
+ * Retrieve a list of all the interfaces controlled by the supplicant.
*
* The corresponding |ISupplicantIface| object for any interface can be
* retrieved using |getInterface| method.
@@ -81,12 +81,12 @@
* Possible status codes:
* |SupplicantStatusCode.SUCCESS|,
* |SupplicantStatusCode.FAILURE_UNKNOWN|
- * @return ifaces List of all interfaces controlled by wpa_supplicant.
+ * @return ifaces List of all interfaces controlled by the supplicant.
*/
listInterfaces() generates (SupplicantStatus status, vec<IfaceInfo> ifaces);
/**
- * Register for callbacks from the wpa_supplicant service.
+ * Register for callbacks from the supplicant service.
*
* These callbacks are invoked for global events that are not specific
* to any interface or network. Registration of multiple callback
@@ -104,9 +104,9 @@
generates (SupplicantStatus status);
/**
- * Set debug parameters for wpa_supplicant.
+ * Set debug parameters for the supplicant.
*
- * @param level Debug logging level for wpa_supplicant.
+ * @param level Debug logging level for the supplicant.
* (one of |DebugLevel| values).
* @param timestamp Determines whether to show timestamps in logs or
* not.
diff --git a/wifi/supplicant/1.0/ISupplicantCallback.hal b/wifi/supplicant/1.0/ISupplicantCallback.hal
index be08a3a..a5a0da5 100644
--- a/wifi/supplicant/1.0/ISupplicantCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantCallback.hal
@@ -17,10 +17,10 @@
package android.hardware.wifi.supplicant@1.0;
/**
- * Callback Interface exposed by the wpa_supplicant service (ISupplicant).
+ * Callback Interface exposed by the supplicant service (ISupplicant).
*
* Clients need to host an instance of this HIDL interface object and
- * pass a reference of the object to wpa_supplicant via the
+ * pass a reference of the object to the supplicant via the
* |ISupplicant.registerCallback| method.
*/
interface ISupplicantCallback {
diff --git a/wifi/supplicant/1.0/ISupplicantIface.hal b/wifi/supplicant/1.0/ISupplicantIface.hal
index afbfd8e..600df30 100644
--- a/wifi/supplicant/1.0/ISupplicantIface.hal
+++ b/wifi/supplicant/1.0/ISupplicantIface.hal
@@ -19,7 +19,7 @@
import ISupplicantNetwork;
/**
- * Interface exposed by wpa_supplicant for each network interface (e.g wlan0)
+ * Interface exposed by the supplicant for each network interface (e.g wlan0)
* it controls.
*/
interface ISupplicantIface {
@@ -97,7 +97,7 @@
generates (SupplicantStatus status, ISupplicantNetwork network);
/**
- * Retrieve a list of all the network Id's controlled by wpa_supplicant.
+ * Retrieve a list of all the network Id's controlled by the supplicant.
*
* The corresponding |ISupplicantNetwork| object for any network can be
* retrieved using |getNetwork| method.
@@ -106,7 +106,7 @@
* Possible status codes:
* |SupplicantStatusCode.SUCCESS|,
* |SupplicantStatusCode.FAILURE_UNKNOWN|
- * @return networkIds List of all network Id's controlled by wpa_supplicant.
+ * @return networkIds List of all network Id's controlled by the supplicant.
*/
listNetworks()
generates (SupplicantStatus status, vec<SupplicantNetworkId> networkIds);
diff --git a/wifi/supplicant/1.0/ISupplicantNetwork.hal b/wifi/supplicant/1.0/ISupplicantNetwork.hal
index acc3359..3c97f63 100644
--- a/wifi/supplicant/1.0/ISupplicantNetwork.hal
+++ b/wifi/supplicant/1.0/ISupplicantNetwork.hal
@@ -17,19 +17,19 @@
package android.hardware.wifi.supplicant@1.0;
/**
- * Interface exposed by wpa_supplicant for each network configuration it
+ * Interface exposed by the supplicant for each network configuration it
* controls.
- * A network is wpa_supplicant's way of representing the configuration
+ * A network is the supplicant's way of representing the configuration
* parameters of a Wifi service set. Service sets are identified by their
* service set identitifier (SSID). The parameters for a network includes the
* credentials, bssid, etc.
*/
interface ISupplicantNetwork {
/**
- * Retrieves the ID allocated to this network by wpa_supplicant.
+ * Retrieves the ID allocated to this network by the supplicant.
*
* This is not the |SSID| of the network, but an internal identifier for
- * this network used by wpa_supplicant.
+ * this network used by the supplicant.
*
* @return status Status of the operation.
* Possible status codes:
diff --git a/wifi/supplicant/1.0/ISupplicantP2pIface.hal b/wifi/supplicant/1.0/ISupplicantP2pIface.hal
index ea0878b..06cd30e 100644
--- a/wifi/supplicant/1.0/ISupplicantP2pIface.hal
+++ b/wifi/supplicant/1.0/ISupplicantP2pIface.hal
@@ -20,7 +20,7 @@
import ISupplicantP2pIfaceCallback;
/**
- * Interface exposed by wpa_supplicant for each P2P mode network
+ * Interface exposed by the supplicant for each P2P mode network
* interface (e.g p2p0) it controls.
*/
interface ISupplicantP2pIface extends ISupplicantIface {
diff --git a/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal b/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
index 1574e6a..9ac8b36 100644
--- a/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.hal
@@ -17,11 +17,11 @@
package android.hardware.wifi.supplicant@1.0;
/**
- * Callback Interface exposed by the wpa_supplicant service
+ * Callback Interface exposed by the supplicant service
* for each P2P mode interface (ISupplicantP2pIface).
*
* Clients need to host an instance of this HIDL interface object and
- * pass a reference of the object to wpa_supplicant via the
+ * pass a reference of the object to the supplicant via the
* corresponding |ISupplicantP2pIface.registerCallback| method.
*/
interface ISupplicantP2pIfaceCallback {
diff --git a/wifi/supplicant/1.0/ISupplicantP2pNetwork.hal b/wifi/supplicant/1.0/ISupplicantP2pNetwork.hal
index 13eeae7..34727c4 100644
--- a/wifi/supplicant/1.0/ISupplicantP2pNetwork.hal
+++ b/wifi/supplicant/1.0/ISupplicantP2pNetwork.hal
@@ -20,7 +20,7 @@
import ISupplicantP2pNetworkCallback;
/**
- * Interface exposed by wpa_supplicant for each P2P mode network
+ * Interface exposed by the supplicant for each P2P mode network
* configuration it controls.
*/
interface ISupplicantP2pNetwork extends ISupplicantNetwork {
diff --git a/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.hal b/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.hal
index d171a09..41603f9 100644
--- a/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.hal
@@ -17,11 +17,11 @@
package android.hardware.wifi.supplicant@1.0;
/**
- * Callback Interface exposed by the wpa_supplicant service
+ * Callback Interface exposed by the supplicant service
* for each network (ISupplicantP2pNetwork).
*
* Clients need to host an instance of this HIDL interface object and
- * pass a reference of the object to wpa_supplicant via the
+ * pass a reference of the object to the supplicant via the
* corresponding |ISupplicantP2pNetwork.registerCallback| method.
*/
interface ISupplicantP2pNetworkCallback {
diff --git a/wifi/supplicant/1.0/ISupplicantStaIface.hal b/wifi/supplicant/1.0/ISupplicantStaIface.hal
index 4e2c7c8..a68e961 100644
--- a/wifi/supplicant/1.0/ISupplicantStaIface.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaIface.hal
@@ -20,7 +20,7 @@
import ISupplicantStaIfaceCallback;
/**
- * Interface exposed by wpa_supplicant for each station mode network
+ * Interface exposed by the supplicant for each station mode network
* interface (e.g wlan0) it controls.
*/
interface ISupplicantStaIface extends ISupplicantIface {
diff --git a/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal b/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
index d104814..77423ed 100644
--- a/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.hal
@@ -17,11 +17,11 @@
package android.hardware.wifi.supplicant@1.0;
/**
- * Callback Interface exposed by the wpa_supplicant service
+ * Callback Interface exposed by the supplicant service
* for each station mode interface (ISupplicantStaIface).
*
* Clients need to host an instance of this HIDL interface object and
- * pass a reference of the object to wpa_supplicant via the
+ * pass a reference of the object to the supplicant via the
* corresponding |ISupplicantStaIface.registerCallback| method.
*/
interface ISupplicantStaIfaceCallback {
@@ -35,31 +35,31 @@
DISCONNECTED = 0,
/**
* This state is entered if the network interface is disabled, e.g.,
- * due to rfkill. wpa_supplicant refuses any new operations that would
+ * due to rfkill. the supplicant refuses any new operations that would
* use the radio until the interface has been enabled.
*/
IFACE_DISABLED = 1,
/**
* This state is entered if there are no enabled networks in the
- * configuration. wpa_supplicant is not trying to associate with a new
+ * configuration. the supplicant is not trying to associate with a new
* network and external interaction (e.g., ctrl_iface call to add or
* enable a network) is needed to start association.
*/
INACTIVE = 2,
/**
- * This state is entered when wpa_supplicant starts scanning for a
+ * This state is entered when the supplicant starts scanning for a
* network.
*/
SCANNING = 3,
/**
- * This state is entered when wpa_supplicant has found a suitable BSS
+ * This state is entered when the supplicant has found a suitable BSS
* to authenticate with and the driver is configured to try to
* authenticate with this BSS. This state is used only with drivers
- * that use wpa_supplicant as the SME.
+ * that use the supplicant as the SME.
*/
AUTHENTICATING = 4,
/**
- * This state is entered when wpa_supplicant has found a suitable BSS
+ * This state is entered when the supplicant has found a suitable BSS
* to associate with and the driver is configured to try to associate
* with this BSS in ap_scan=1 mode. When using ap_scan=2 mode, this
* state is entered when the driver is configured to try to associate
@@ -69,7 +69,7 @@
/**
* This state is entered when the driver reports that association has
* been successfully completed with an AP. If IEEE 802.1X is used
- * (with or without WPA/WPA2), wpa_supplicant remains in this state
+ * (with or without WPA/WPA2), the supplicant remains in this state
* until the IEEE 802.1X/EAPOL authentication has been completed.
*/
ASSOCIATED = 6,
diff --git a/wifi/supplicant/1.0/ISupplicantStaNetwork.hal b/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
index ce23932..d159c57 100644
--- a/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaNetwork.hal
@@ -20,7 +20,7 @@
import ISupplicantStaNetworkCallback;
/**
- * Interface exposed by wpa_supplicant for each station mode network
+ * Interface exposed by the supplicant for each station mode network
* configuration it controls.
*/
interface ISupplicantStaNetwork extends ISupplicantNetwork {
@@ -140,7 +140,7 @@
/**
* Setters for the various network params.
* These correspond to elements of |wpa_sssid| struct used internally by
- * wpa_supplicant to represent each network.
+ * the supplicant to represent each network.
*/
/**
* Set SSID for this network.
diff --git a/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.hal b/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.hal
index 2419dcc..6d45e0e 100644
--- a/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.hal
+++ b/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.hal
@@ -17,11 +17,11 @@
package android.hardware.wifi.supplicant@1.0;
/**
- * Callback Interface exposed by the wpa_supplicant service
+ * Callback Interface exposed by the supplicant service
* for each network (ISupplicantStaNetwork).
*
* Clients need to host an instance of this HIDL interface object and
- * pass a reference of the object to wpa_supplicant via the
+ * pass a reference of the object to the supplicant via the
* corresponding |ISupplicantStaNetwork.registerCallback| method.
*/
interface ISupplicantStaNetworkCallback {