commit b5dc8004f31361ff257a0683752afecd4cc53a52
author Jamie Gennis <jgennis@google.com> Thu Jan 13 12:57:21 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 13 12:57:21 2011 -0800
tree 97c7faa7a5c1993d019d67475b3e12bfe5e7ce90
parent c16387eb1db8bf837f95fa35655bd56e63631ccc
parent 9a78c90cd46b2a3bd637b056873149d3b94384b4

Merge "Fix remote GraphicBuffer allocation in SurfaceFlinger." into honeycomb

vpn/java/android/net/vpn/VpnManager.java

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 @@
     // 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 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) {