Fix VPN profile path in settings.
http://b/issue?id=2485656
...and eliminate multiple Settings instances in history stack
Change-Id: I076b78781ee7ce458f82e6d9659a94ce64841a0e
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80c9766..97fbaec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -189,7 +189,7 @@
<activity android:name=".vpn.VpnSettings"
android:configChanges="orientation|keyboardHidden"
- android:launchMode="singleTask">
+ android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.net.vpn.SETTINGS" />
diff --git a/src/com/android/settings/vpn/VpnSettings.java b/src/com/android/settings/vpn/VpnSettings.java
index d380375..8880780 100644
--- a/src/com/android/settings/vpn/VpnSettings.java
+++ b/src/com/android/settings/vpn/VpnSettings.java
@@ -90,7 +90,7 @@
private static final String PREF_ADD_VPN = "add_new_vpn";
private static final String PREF_VPN_LIST = "vpn_list";
- private static final String PROFILES_ROOT = VpnManager.PROFILES_PATH + "/";
+ private static final String PROFILES_ROOT = VpnManager.getProfilePath() + "/";
private static final String PROFILE_OBJ_FILE = ".pobj";
private static final int REQUEST_ADD_OR_EDIT_PROFILE = 1;