summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJason parks <jparks@google.com>2011-01-13 14:15:43 -0600
committerJason parks <jparks@google.com>2011-01-13 14:15:43 -0600
commita3cdaa5337fa573c4c61770195d6232c2e587090 (patch)
tree99aa62f3acc658a587c2d8a3c33107cf92281dbb /packages
parentc15c7a79a69733bd21d6548fd74c2874fdabe7e8 (diff)
downloadframeworks_base-a3cdaa5337fa573c4c61770195d6232c2e587090.zip
frameworks_base-a3cdaa5337fa573c4c61770195d6232c2e587090.tar.gz
frameworks_base-a3cdaa5337fa573c4c61770195d6232c2e587090.tar.bz2
Revert "Remove the APIs for the old encryption scheme."
This reverts commit 1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
Diffstat (limited to 'packages')
-rw-r--r--packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
index 3b53194..eeafd5a 100644
--- a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
+++ b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
@@ -28,6 +28,7 @@ import android.net.vpn.VpnProfile;
import android.net.vpn.VpnState;
import android.os.Environment;
import android.os.IBinder;
+import android.os.SystemProperties;
import android.util.Log;
import java.io.File;
@@ -55,7 +56,7 @@ public class VpnServiceBinder extends Service {
private static String getStateFilePath() {
// This call will return the correcu directory whether Encrypted FS is enabled or not
// Disabled: /data/misc/vpn/.states Enabled: /data/secure/misc/vpn/.states
- return Environment.getDataDirectory().getPath() + STATES_FILE_RELATIVE_PATH;
+ return Environment.getSecureDataDirectory().getPath() + STATES_FILE_RELATIVE_PATH;
}
private final IBinder mBinder = new IVpnService.Stub() {