diff options
| author | Oscar Montemayor <oam@google.com> | 2009-11-18 10:14:20 -0800 |
|---|---|---|
| committer | Oscar Montemayor <oam@google.com> | 2009-11-24 11:44:19 -0800 |
| commit | a8529f68671a8a118751cb6ad577f44eaf076b96 (patch) | |
| tree | bf191767698261c9bdd7b599593f3177a188da7d /vpn | |
| parent | 579d418db016a9ae87479da9e29d8827474d68f5 (diff) | |
| download | frameworks_base-a8529f68671a8a118751cb6ad577f44eaf076b96.zip frameworks_base-a8529f68671a8a118751cb6ad577f44eaf076b96.tar.gz frameworks_base-a8529f68671a8a118751cb6ad577f44eaf076b96.tar.bz2 | |
Encrypted File Systems Project. Installer modifications.
Started to modify isntaller for data redirection to a secure location.
Diffstat (limited to 'vpn')
| -rw-r--r-- | vpn/java/android/net/vpn/VpnManager.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vpn/java/android/net/vpn/VpnManager.java b/vpn/java/android/net/vpn/VpnManager.java index 6df612e..311221c 100644 --- a/vpn/java/android/net/vpn/VpnManager.java +++ b/vpn/java/android/net/vpn/VpnManager.java @@ -16,11 +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; /** @@ -65,7 +69,7 @@ public class VpnManager { /** Error code to indicate a successful connection. */ public static final int VPN_ERROR_NO_ERROR = 0; - public static final String PROFILES_PATH = "/data/misc/vpn/profiles"; + private static final String PROFILES_PATH = "/misc/vpn/profiles"; private static final String PACKAGE_PREFIX = VpnManager.class.getPackage().getName() + "."; @@ -77,7 +81,13 @@ public class VpnManager { private static final String ACTION_VPN_SETTINGS = PACKAGE_PREFIX + "SETTINGS"; - private static final String TAG = VpnManager.class.getSimpleName(); + public static final String TAG = VpnManager.class.getSimpleName(); + + // 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.getSecureDataDirectory().getPath() + PROFILES_PATH; + } /** * Returns all supported VPN types. |