diff options
| author | Etan Cohen <etancohen@google.com> | 2017-06-23 19:04:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-23 19:04:00 +0000 |
| commit | 8345f77720c49b9d7e082094a106ccb23ea906bb (patch) | |
| tree | 45ad9759dc00195a96bf3bfb98cf5fd2d4d39e10 /service | |
| parent | 2a43452d959e87ad47b9b4a5e16d56050ca0d56a (diff) | |
| parent | 972db8f5f7f09614625609a15270bc5940f0ecae (diff) | |
Merge "[AWARE] Move initialization from main system server thread" into oc-dr1-dev am: db83149363
am: 972db8f5f7
Change-Id: Iae31c22bcc72558e2a44b8d366878bddd43dddd0
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java | 1 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareService.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java b/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java index 47f3030ec..da6bb24bb 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNativeManager.java @@ -57,6 +57,7 @@ public class WifiAwareNativeManager { } public void start() { + mHalDeviceManager.initialize(); mHalDeviceManager.registerStatusListener( new HalDeviceManager.ManagerStatusListener() { @Override diff --git a/service/java/com/android/server/wifi/aware/WifiAwareService.java b/service/java/com/android/server/wifi/aware/WifiAwareService.java index 40baf7eed..9aa561354 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareService.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareService.java @@ -53,7 +53,6 @@ public final class WifiAwareService extends SystemService { } HalDeviceManager halDeviceManager = wifiInjector.getHalDeviceManager(); - halDeviceManager.initialize(); WifiAwareStateManager wifiAwareStateManager = new WifiAwareStateManager(); WifiAwareNativeCallback wifiAwareNativeCallback = new WifiAwareNativeCallback( |