diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-12-03 14:31:30 -0800 |
|---|---|---|
| committer | mosimchah <mosimchah@gmail.com> | 2021-03-04 18:56:02 -0500 |
| commit | d683bd717017644f520a9365a9f56c837b6c284c (patch) | |
| tree | 4932148b62a9c4e4941ae6e6c8f8529e9d471081 /service/java/com/android/server/wifi/WifiInjector.java | |
| parent | 07ee233512c631e2a434bb371c9bd8c8158adaf6 (diff) | |
Also, squashes the follow up commit to create a single CL for
backporting:
=======
PasspointManager: Don't allow bg user to modify passpoint profiles
Also, add safety net logging for this bug.
=======
Bug: 174749461
Test: atest com.android.server.wifi
Change-Id: Ifc79ffeb04a7be99a9c60d9414b72e88275c0514
Merged-In: Ifc79ffeb04a7be99a9c60d9414b72e88275c0514
(cherry picked from commit e799efba85cbe52044a067869af71d9c15b573bb)
(cherry picked from commit 23685b8604571ec623e539f4f9c66db65c9dde81)
(cherry picked from commit 95673e85133c78773870fb5161bb300b7f2ee51e)
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 633d6a78e..17106c187 100644 --- a/service/java/com/android/server/wifi/WifiInjector.java +++ b/service/java/com/android/server/wifi/WifiInjector.java @@ -291,7 +291,7 @@ public class WifiInjector { mPasspointManager = new PasspointManager(mContext, this, new Handler(mWifiCoreHandlerThread.getLooper()), mWifiNative, mWifiKeyStore, mClock, mSimAccessor, new PasspointObjectFactory(), mWifiConfigManager, mWifiConfigStore, - mWifiMetrics, makeTelephonyManager(), subscriptionManager); + mWifiMetrics, makeTelephonyManager(), subscriptionManager, mWifiPermissionsUtil); mPasspointNetworkEvaluator = new PasspointNetworkEvaluator( mPasspointManager, mWifiConfigManager, mConnectivityLocalLog, mCarrierNetworkConfig, this, subscriptionManager); |