diff options
| author | Etan Cohen <etancohen@google.com> | 2017-06-17 02:12:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-17 02:12:06 +0000 |
| commit | 4640b5a5825007cb79fc796adee1d48385b2ad7c (patch) | |
| tree | feee466d5c2dd4cd9ff8f5642e302bb5d1714663 /service | |
| parent | e2f3046fbe9bcb4a92620a8efc5b989619ccf0c5 (diff) | |
| parent | d928bcf0f3d77cf30bd567082a93bb3b3e8da8f6 (diff) | |
Merge "[AWARE] Fix NAN/P2P concurrency failure" into oc-dr1-dev am: bb2ab212b4
am: d928bcf0f3
Change-Id: I19c417b4f1ec01e3abbbb7c6fd82014f856ebc68
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java index 9d2f3d062..47f3030ec 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java @@ -75,6 +75,8 @@ public class WifiAwareNativeManager { } }, null); if (mHalDeviceManager.isStarted()) { + mHalDeviceManager.registerInterfaceAvailableForRequestListener( + IfaceType.NAN, mInterfaceAvailableForRequestListener, null); tryToGetAware(); } } |