diff options
| author | Jason parks <jparks@google.com> | 2011-01-13 14:15:43 -0600 |
|---|---|---|
| committer | Jason parks <jparks@google.com> | 2011-01-13 14:15:43 -0600 |
| commit | a3cdaa5337fa573c4c61770195d6232c2e587090 (patch) | |
| tree | 99aa62f3acc658a587c2d8a3c33107cf92281dbb /vpn/java | |
| parent | c15c7a79a69733bd21d6548fd74c2874fdabe7e8 (diff) | |
| download | frameworks_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 'vpn/java')
| -rw-r--r-- | vpn/java/android/net/vpn/VpnManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vpn/java/android/net/vpn/VpnManager.java b/vpn/java/android/net/vpn/VpnManager.java index 60fecc2..ce40b5d 100644 --- a/vpn/java/android/net/vpn/VpnManager.java +++ b/vpn/java/android/net/vpn/VpnManager.java @@ -16,12 +16,15 @@ package android.net.vpn; +import java.io.File; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.ServiceConnection; import android.os.Environment; +import android.os.SystemProperties; import android.util.Log; /** @@ -83,7 +86,7 @@ public class VpnManager { // TODO(oam): Test VPN when EFS is enabled (will do later)... public static String getProfilePath() { // This call will return the correct path if Encrypted FS is enabled or not. - return Environment.getDataDirectory().getPath() + PROFILES_PATH; + return Environment.getSecureDataDirectory().getPath() + PROFILES_PATH; } /** @@ -121,7 +124,7 @@ public class VpnManager { */ public VpnProfile createVpnProfile(VpnType type, boolean customized) { try { - VpnProfile p = type.getProfileClass().newInstance(); + VpnProfile p = (VpnProfile) type.getProfileClass().newInstance(); p.setCustomized(customized); return p; } catch (InstantiationException e) { |