ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Merge "Remove the APIs for the old encryption scheme." into honeycomb

Browse Source
This commit is contained in:
Jason parks 2011-01-13 07:40:46 -08:00 committed by Android (Google) Code Review
commit 0d99621dcf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vpn/java/android/net/vpn/VpnManager.java
View File

@ -16,15 +16,12 @@
package android.net.vpn; package android.net.vpn;
import java.io.File;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.os.Environment; import android.os.Environment;
import android.os.SystemProperties;
import android.util.Log; import android.util.Log;
/** /**
@ -86,7 +83,7 @@ public class VpnManager {
// TODO(oam): Test VPN when EFS is enabled (will do later)... // TODO(oam): Test VPN when EFS is enabled (will do later)...
public static String getProfilePath() { public static String getProfilePath() {
// This call will return the correct path if Encrypted FS is enabled or not. // This call will return the correct path if Encrypted FS is enabled or not.
return Environment.getSecureDataDirectory().getPath() + PROFILES_PATH; return Environment.getDataDirectory().getPath() + PROFILES_PATH;
} }
/** /**
@ -124,7 +121,7 @@ public class VpnManager {
*/ */
public VpnProfile createVpnProfile(VpnType type, boolean customized) { public VpnProfile createVpnProfile(VpnType type, boolean customized) {
try { try {
VpnProfile p = (VpnProfile) type.getProfileClass().newInstance(); VpnProfile p = type.getProfileClass().newInstance();
p.setCustomized(customized); p.setCustomized(customized);
return p; return p;
} catch (InstantiationException e) { } catch (InstantiationException e) {