diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:38:11 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:38:11 -0800 |
| commit | 6c8bc31ebe68911a97c450e123e08f3881cd80ce (patch) | |
| tree | 9486f51f5f4f23a6c0fc2ba856cba832438d38c3 /include | |
| parent | 4ab7bb48a4a0d4cecd4e3f5de6d88075a7b20f48 (diff) | |
| parent | a7c17deb32fe28230b77b0dff17bb113088a5c16 (diff) | |
| download | hardware_libhardware_legacy-6c8bc31ebe68911a97c450e123e08f3881cd80ce.tar.gz hardware_libhardware_legacy-6c8bc31ebe68911a97c450e123e08f3881cd80ce.tar.bz2 hardware_libhardware_legacy-6c8bc31ebe68911a97c450e123e08f3881cd80ce.zip | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/hardware/libhardware_legacy into 1.1
Android 4.2.2 release 1
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 1 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 47ee3c3..16c3b16 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -250,6 +250,7 @@ protected: audio_devices_t supportedDevices(); uint32_t latency(); bool sharesHwModuleWith(const AudioOutputDescriptor *outputDesc); + bool isActive(uint32_t inPastMs) const; audio_io_handle_t mId; // output handle uint32_t mSamplingRate; // diff --git a/include/hardware_legacy/wifi.h b/include/hardware_legacy/wifi.h index 01d73e4..1233730 100644 --- a/include/hardware_legacy/wifi.h +++ b/include/hardware_legacy/wifi.h @@ -55,7 +55,7 @@ int wifi_start_supplicant(int p2pSupported); * * @return 0 on success, < 0 on failure. */ -int wifi_stop_supplicant(); +int wifi_stop_supplicant(int p2pSupported); /** * Open a connection to supplicant on interface |