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

resolved conflicts for merge of bbe409d3 to master

Browse Source 
Change-Id: I5d64f8d628636f3621b765873aade25eca948576
This commit is contained in:
Kenny Root
2013-02-14 13:25:19 -08:00
parent 7ff56d331e bbe409d3ce
commit 595a891922
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SecuritySettings.java
View File

@@ -407,9 +407,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
Settings.System.TEXT_SHOW_PASSWORD, 1) != 0); Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
} }
KeyStore.State state = KeyStore.getInstance().state();
if (mResetCredentials != null) { if (mResetCredentials != null) {
mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED); KeyStore keyStore = KeyStore.getInstance();
mResetCredentials.setEnabled(!keyStore.isUnlocked());
} }
} }

2
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -155,7 +155,7 @@ public class VpnSettings extends SettingsPreferenceFragment implements
super.onResume(); super.onResume();
// Check KeyStore here, so others do not need to deal with it. // Check KeyStore here, so others do not need to deal with it.
if (mKeyStore.state() != KeyStore.State.UNLOCKED) { if (!mKeyStore.isUnlocked()) {
if (!mUnlocking) { if (!mUnlocking) {
// Let us unlock KeyStore. See you later! // Let us unlock KeyStore. See you later!
Credentials.getInstance().unlock(getActivity()); Credentials.getInstance().unlock(getActivity());