diff options
| author | Samuel Tan <samueltan@google.com> | 2016-04-12 10:37:25 -0700 |
|---|---|---|
| committer | Samuel Tan <samueltan@google.com> | 2016-04-13 12:47:58 -0700 |
| commit | b571743f406cbe1c13cc0fdfcd9fc58093728f4c (patch) | |
| tree | 7e6f5d1eab10463aa486629cd04ebe8c59bc7247 | |
| parent | 41a43eccc1f100f15bc37755d9824494d1ea773a (diff) | |
WifiConfigStore: remove migrateCerts()
The abovementioned method was introduced 3 years ago,
and should not be needed anymore.
BUG: 28124406
Change-Id: Ia5efa8a068c1a68b875bcbe1b21424d7ab201e4a
TEST: 'runtest frameworks-wifi' passes.
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java index 7f92eb1d8..dc376eb8b 100644 --- a/service/java/com/android/server/wifi/WifiConfigStore.java +++ b/service/java/com/android/server/wifi/WifiConfigStore.java @@ -214,34 +214,6 @@ public class WifiConfigStore { } /** - * Migrate certs from global pool to wifi UID if not already done - */ - private void migrateCerts(WifiEnterpriseConfig config) { - String client = config.getClientCertificateAlias(); - // a valid client certificate is configured - if (!TextUtils.isEmpty(client)) { - if (!mKeyStore.contains(Credentials.USER_PRIVATE_KEY + client, Process.WIFI_UID)) { - mKeyStore.duplicate(Credentials.USER_PRIVATE_KEY + client, -1, - Credentials.USER_PRIVATE_KEY + client, Process.WIFI_UID); - mKeyStore.duplicate(Credentials.USER_CERTIFICATE + client, -1, - Credentials.USER_CERTIFICATE + client, Process.WIFI_UID); - } - } - - String[] aliases = config.getCaCertificateAliases(); - // a valid ca certificate is configured - if (aliases != null) { - for (String ca : aliases) { - if (!TextUtils.isEmpty(ca) - && !mKeyStore.contains(Credentials.CA_CERTIFICATE + ca, Process.WIFI_UID)) { - mKeyStore.duplicate(Credentials.CA_CERTIFICATE + ca, -1, - Credentials.CA_CERTIFICATE + ca, Process.WIFI_UID); - } - } - } - } - - /** * Read the variables from the supplicant daemon that are needed to * fill in the WifiConfiguration object. * @@ -355,8 +327,6 @@ public class WifiConfigStore { config.enterpriseConfig = new WifiEnterpriseConfig(); } config.enterpriseConfig.loadFromSupplicant(new SupplicantLoader(netId)); - - migrateCerts(config.enterpriseConfig); } /** |