diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-21 05:12:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-21 05:12:31 +0000 |
| commit | 5c6fde5090017c39433085af430c1287d374fe25 (patch) | |
| tree | 8f35b597c6157b5dd21f443171d7ee0892cd1636 /service/java/com/android/server/wifi/WifiInjector.java | |
| parent | 395708f3850bcb0526635a2b85d1eae352a184c6 (diff) | |
| parent | 5540b4250c661121b57c4d6359ebbc9798443ef8 (diff) | |
| download | android_frameworks_opt_net_wifi-5c6fde5090017c39433085af430c1287d374fe25.tar.gz android_frameworks_opt_net_wifi-5c6fde5090017c39433085af430c1287d374fe25.tar.bz2 android_frameworks_opt_net_wifi-5c6fde5090017c39433085af430c1287d374fe25.zip | |
Merge changes from topic "check_vendor_hal_support"
* changes:
HalDevManager: Cache the result of vendor hal support in init flow
Revert "Revert "WifiP2pNative: Support devices with no vendor HAL""
Diffstat (limited to 'service/java/com/android/server/wifi/WifiInjector.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiInjector.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java index c03c46aad..9826a4cc8 100644 --- a/service/java/com/android/server/wifi/WifiInjector.java +++ b/service/java/com/android/server/wifi/WifiInjector.java @@ -210,7 +210,8 @@ public class WifiInjector { mWifiP2pMonitor = new WifiP2pMonitor(this); mSupplicantP2pIfaceHal = new SupplicantP2pIfaceHal(mWifiP2pMonitor); mWifiP2pNative = new WifiP2pNative( - mWifiVendorHal, mSupplicantP2pIfaceHal, mHalDeviceManager); + mWifiVendorHal, mSupplicantP2pIfaceHal, mHalDeviceManager, + mPropertyService); // Now get instances of all the objects that depend on the HandlerThreads mWifiTrafficPoller = new WifiTrafficPoller(clientModeImplLooper); |