summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-02-14 10:18:38 -0800
committerKenny Root <kroot@google.com>2013-02-14 12:06:51 -0800
commitb9594ce9ebb3f5f303a280f04312ae5754ce3560 (patch)
treec2d5554829d9dfce6c387a7a41a2218d5bd5f276 /services
parent37edbbc62fa031c75ce5a1298fdd07d981907e89 (diff)
downloadframeworks_base-b9594ce9ebb3f5f303a280f04312ae5754ce3560.zip
frameworks_base-b9594ce9ebb3f5f303a280f04312ae5754ce3560.tar.gz
frameworks_base-b9594ce9ebb3f5f303a280f04312ae5754ce3560.tar.bz2
KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ConnectivityService.java2
-rw-r--r--services/java/com/android/server/connectivity/Vpn.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index cccaf1c..e5cfdf6 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3384,7 +3384,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// Tear down existing lockdown if profile was removed
mLockdownEnabled = LockdownVpnTracker.isEnabled();
if (mLockdownEnabled) {
- if (mKeyStore.state() != KeyStore.State.UNLOCKED) {
+ if (!mKeyStore.isUnlocked()) {
Slog.w(TAG, "KeyStore locked; unable to create LockdownTracker");
return false;
}
diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index bb19cc7..bb7334a 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -462,7 +462,7 @@ public class Vpn extends BaseNetworkStateTracker {
* secondary thread to perform connection work, returning quickly.
*/
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");
}