PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KeyStore: stop using state()

Browse Source 
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
This commit is contained in:
Kenny Root
2013-02-14 10:27:22 -08:00
parent 5c879e48ed
commit ca714d8d0c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -412,8 +412,7 @@ public class WifiSettings extends SettingsPreferenceFragment
}
getActivity().registerReceiver(mReceiver, mFilter);
if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
if (mKeyStoreNetworkId != INVALID_NETWORK_ID && KeyStore.getInstance().isUnlocked()) {
mWifiManager.connect(mKeyStoreNetworkId, mConnectListener);
}
mKeyStoreNetworkId = INVALID_NETWORK_ID;
@@ -701,8 +700,7 @@ public class WifiSettings extends SettingsPreferenceFragment
}
private boolean requireKeyStore(WifiConfiguration config) {
if (WifiConfigController.requireKeyStore(config) &&
KeyStore.getInstance().state() != KeyStore.State.UNLOCKED) {
if (WifiConfigController.requireKeyStore(config) && !KeyStore.getInstance().isUnlocked()) {
mKeyStoreNetworkId = config.networkId;
Credentials.getInstance().unlock(getActivity());
return true;