summaryrefslogtreecommitdiffstats
path: root/packages/VpnServices
diff options
context:
space:
mode:
authorOscar Montemayor <oam@google.com>2010-03-26 18:44:14 -0700
committerOscar Montemayor <oam@google.com>2010-03-29 18:12:24 -0700
commit1f4df90bfab8ca42eabe95f19eadff3432eee7fd (patch)
tree13d9bc806e8850259b2b939d7ee9cf02651bf9d7 /packages/VpnServices
parent59fc58dc3f164e33a96aee09505fac5818747cb6 (diff)
downloadframeworks_base-1f4df90bfab8ca42eabe95f19eadff3432eee7fd.zip
frameworks_base-1f4df90bfab8ca42eabe95f19eadff3432eee7fd.tar.gz
frameworks_base-1f4df90bfab8ca42eabe95f19eadff3432eee7fd.tar.bz2
DO NOT MERGE
Removing unused features from source tree. Please refer to Bug#2502219. Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
Diffstat (limited to 'packages/VpnServices')
-rw-r--r--packages/VpnServices/src/com/android/server/vpn/VpnServiceBinder.java5
1 files changed, 1 insertions, 4 deletions
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() {