Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe6015b4 authored by Oscar Montemayor's avatar Oscar Montemayor Committed by Android Git Automerger
Browse files

am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree.... 

am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo

Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
parents 88cef743 0e23025c

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,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.

        return Environment.getDataDirectory().getPath() + PROFILES_PATH;

        return Environment.getSecureDataDirectory().getPath() + PROFILES_PATH;

    }

    }





    /**

    /**