diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-04-13 17:10:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-13 17:10:18 +0000 |
| commit | 2e17da3b28b31b24aabd18367347c2a15f148cd1 (patch) | |
| tree | 5b74b5a211d67092c38247622b96e6e9ffe62266 /service | |
| parent | 6e1539d01b5c05f790d803b98128f2a03b7e155f (diff) | |
| parent | 0fe550277a9db5a06d8d8265f50a87b4645094f8 (diff) | |
Merge "WifiConfigManager: remove OLD_PRIVATE_KEY_NAME" into nyc-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 3aa3b9319..22b1e39cb 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -149,8 +149,8 @@ import java.util.zip.Checksum; * */ public class WifiConfigManager { - - private Context mContext; + private static boolean sVDBG = false; + private static boolean sVVDBG = false; public static final String TAG = "WifiConfigManager"; public static final int MAX_TX_PACKET_FOR_FULL_SCANS = 8; public static final int MAX_RX_PACKET_FOR_FULL_SCANS = 16; @@ -158,19 +158,6 @@ public class WifiConfigManager { public static final int MAX_RX_PACKET_FOR_PARTIAL_SCANS = 80; public static final boolean ROAM_ON_ANY = false; public static final int MAX_NUM_SCAN_CACHE_ENTRIES = 128; - - /* Enterprise configuration keys */ - /** - * In old configurations, the "private_key" field was used. However, newer - * configurations use the key_id field with the engine_id set to "keystore". - * If this field is found in the configuration, the migration code is - * triggered. - */ - public static final String OLD_PRIVATE_KEY_NAME = "private_key"; - - private static boolean sVDBG = false; - private static boolean sVVDBG = false; - private static final boolean DBG = true; private static final String PPS_FILE = "/data/misc/wifi/PerProviderSubscription.conf"; private static final String IP_CONFIG_FILE = @@ -289,6 +276,7 @@ public class WifiConfigManager { private final UserManager mUserManager; private final Object mActiveScanDetailLock = new Object(); + private Context mContext; private FrameworkFacade mFacade; private Clock mClock; private IpConfigStore mIpconfigStore; |