LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am dc7b3e3b: am 012e650e: 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 30fe264f5c 012e650ed2
commit 7209c0bb2f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
} }