diff options
| author | Etan Cohen <etancohen@google.com> | 2017-06-22 12:48:11 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-06-22 12:48:11 -0700 |
| commit | 9b37a65ec7b89ca58639443fd899824b28d04191 (patch) | |
| tree | 9c50dd7419324bf6add3be96a2d0c1de02594ca4 | |
| parent | bb2ab212b47ff2dc65e06048684cfe50c1d543bc (diff) | |
[AWARE] Move initialization from main system server thread
Finalize the move of all potentially blocking operations from
the main system server thread to a delayed initialization on the
Aware thread.
Bug: 62890610
Test: unit tests, boot and verify Aware service up
Change-Id: Iba45fa6ca170cfe79c896822992662ba7e5b6064
| -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( |