From 1f4df90bfab8ca42eabe95f19eadff3432eee7fd Mon Sep 17 00:00:00 2001
From: Oscar Montemayor <oam@google.com>
Date: Fri, 26 Mar 2010 18:44:14 -0700
Subject: DO NOT MERGE Removing unused features from source tree. Please refer
 to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
---
 packages/SettingsProvider/AndroidManifest.xml                        | 2 --
 .../VpnServices/src/com/android/server/vpn/VpnServiceBinder.java     | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/SettingsProvider/AndroidManifest.xml b/packages/SettingsProvider/AndroidManifest.xml
index dd0d064..d057ab7 100644
--- a/packages/SettingsProvider/AndroidManifest.xml
+++ b/packages/SettingsProvider/AndroidManifest.xml
@@ -8,8 +8,6 @@
                  android:backupAgent="SettingsBackupAgent"
                  android:killAfterRestore="false"
                  android:icon="@drawable/ic_launcher_settings">
-                 
-    <!-- todo add: android:neverEncrypt="true" -->
 
         <provider android:name="SettingsProvider" android:authorities="settings"
                   android:multiprocess="false"
diff --git a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
index eeafd5a..5672a01 100644
--- a/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
+++ b/packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java
@@ -52,11 +52,8 @@ public class VpnServiceBinder extends Service {
     // The actual implementation is delegated to the VpnService class.
     private VpnService<? extends VpnProfile> mService;
 
-    // TODO(oam): Test VPN when EFS is enabled (will do later)...
     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.getSecureDataDirectory().getPath() + STATES_FILE_RELATIVE_PATH;
+	return Environment.getDataDirectory().getPath() + STATES_FILE_RELATIVE_PATH;
     }
 
     private final IBinder mBinder = new IVpnService.Stub() {
-- 
cgit v1.1