diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-13 01:06:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-13 01:06:07 +0000 |
| commit | 06889f85bba6c6d921e7dd8fc2e1eb8158d6fccc (patch) | |
| tree | 691b9e5a13e6b7cf0591c951d21d58bdd8546c7a /service/java/com/android/server/wifi/WifiInjector.java | |
| parent | d545f2c8866a0b044e405597c657f0b296fa976d (diff) | |
| parent | 12b119b9962852d94c57132f691a851ac854c3c9 (diff) | |
| download | android_frameworks_opt_net_wifi-06889f85bba6c6d921e7dd8fc2e1eb8158d6fccc.tar.gz android_frameworks_opt_net_wifi-06889f85bba6c6d921e7dd8fc2e1eb8158d6fccc.tar.bz2 android_frameworks_opt_net_wifi-06889f85bba6c6d921e7dd8fc2e1eb8158d6fccc.zip | |
Merge changes from topic "credential_from_app_request"
* changes:
WifiNetworkFactory: Use credentials from app's request
WifiConfigManager: Expire deleted ephemeral ssid entries
Diffstat (limited to 'service/java/com/android/server/wifi/WifiInjector.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiInjector.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java index 437ec0d91..3045731d5 100644 --- a/service/java/com/android/server/wifi/WifiInjector.java +++ b/service/java/com/android/server/wifi/WifiInjector.java @@ -234,7 +234,7 @@ public class WifiInjector { mWifiKeyStore, mWifiConfigStore, mWifiPermissionsUtil, mWifiPermissionsWrapper, new NetworkListSharedStoreData(mContext), new NetworkListUserStoreData(mContext), - new DeletedEphemeralSsidsStoreData(), new RandomizedMacStoreData(), + new DeletedEphemeralSsidsStoreData(mClock), new RandomizedMacStoreData(), mFrameworkFacade, mWifiCoreHandlerThread.getLooper()); mWifiScoreCard = new WifiScoreCard(mClock, "TODO(b/112196799) seed me properly"); mWifiMetrics.setWifiConfigManager(mWifiConfigManager); |