drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"

Browse Source 
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()
This commit is contained in:
Kenny Root
2013-02-14 12:50:34 -08:00
committed by Android Git Automerger
parent 58a1ca6642 dc7b3e3b6e
commit 0786207be5
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/KeyStore.java
View File

@ -74,6 +74,10 @@ public class KeyStore {
} }
} }
public boolean isUnlocked() {
return state() == State.UNLOCKED;
}
public byte[] get(String key) { public byte[] get(String key) {
try { try {
return mBinder.get(key); return mBinder.get(key);

5
keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java
View File

@ -62,11 +62,10 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase {
assertTrue(mAndroidKeyStore.reset()); assertTrue(mAndroidKeyStore.reset());
assertEquals(android.security.KeyStore.State.UNINITIALIZED, mAndroidKeyStore.state()); assertFalse(mAndroidKeyStore.isUnlocked());
assertTrue(mAndroidKeyStore.password("1111")); assertTrue(mAndroidKeyStore.password("1111"));
assertTrue(mAndroidKeyStore.isUnlocked());
assertEquals(android.security.KeyStore.State.UNLOCKED, mAndroidKeyStore.state());
assertEquals(0, mAndroidKeyStore.saw("").length); assertEquals(0, mAndroidKeyStore.saw("").length);

6
keystore/tests/src/android/security/AndroidKeyStoreTest.java
View File

@ -467,12 +467,10 @@ public class AndroidKeyStoreTest extends AndroidTestCase {
mAndroidKeyStore = android.security.KeyStore.getInstance(); mAndroidKeyStore = android.security.KeyStore.getInstance();
assertTrue(mAndroidKeyStore.reset()); assertTrue(mAndroidKeyStore.reset());
assertFalse(mAndroidKeyStore.isUnlocked());
assertEquals(android.security.KeyStore.State.UNINITIALIZED, mAndroidKeyStore.state());
assertTrue(mAndroidKeyStore.password("1111")); assertTrue(mAndroidKeyStore.password("1111"));
assertTrue(mAndroidKeyStore.isUnlocked());
assertEquals(android.security.KeyStore.State.UNLOCKED, mAndroidKeyStore.state());
assertEquals(0, mAndroidKeyStore.saw("").length); assertEquals(0, mAndroidKeyStore.saw("").length);

2
services/java/com/android/server/ConnectivityService.java
View File

@ -3341,7 +3341,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// Tear down existing lockdown if profile was removed // Tear down existing lockdown if profile was removed
mLockdownEnabled = LockdownVpnTracker.isEnabled(); mLockdownEnabled = LockdownVpnTracker.isEnabled();
if (mLockdownEnabled) { if (mLockdownEnabled) {
if (mKeyStore.state() != KeyStore.State.UNLOCKED) { if (!mKeyStore.isUnlocked()) {
Slog.w(TAG, "KeyStore locked; unable to create LockdownTracker"); Slog.w(TAG, "KeyStore locked; unable to create LockdownTracker");
return false; return false;
} }

2
services/java/com/android/server/connectivity/Vpn.java
View File

@ -462,7 +462,7 @@ public class Vpn extends BaseNetworkStateTracker {
* secondary thread to perform connection work, returning quickly. * secondary thread to perform connection work, returning quickly.
*/ */
public void startLegacyVpn(VpnProfile profile, KeyStore keyStore, LinkProperties egress) { public void startLegacyVpn(VpnProfile profile, KeyStore keyStore, LinkProperties egress) {
if (keyStore.state() != KeyStore.State.UNLOCKED) { if (!keyStore.isUnlocked()) {
throw new IllegalStateException("KeyStore isn't unlocked"); throw new IllegalStateException("KeyStore isn't unlocked");
} }