diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-03-09 12:25:01 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-03-09 12:25:01 +0800 |
| commit | 488dc08b0baa35b877280117a55ef97cb0cd94f7 (patch) | |
| tree | 0b31fe1ecc19946e13be21c6ac6facf1bc514ae3 | |
| parent | f69dcab6aca2381cdd68270ae485580c429536f8 (diff) | |
| download | packages_apps_Settings-488dc08b0baa35b877280117a55ef97cb0cd94f7.zip packages_apps_Settings-488dc08b0baa35b877280117a55ef97cb0cd94f7.tar.gz packages_apps_Settings-488dc08b0baa35b877280117a55ef97cb0cd94f7.tar.bz2 | |
Fix VPN profile path in settings.
http://b/issue?id=2485656
...and eliminate multiple Settings instances in history stack
Change-Id: I076b78781ee7ce458f82e6d9659a94ce64841a0e
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/vpn/VpnSettings.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 @@ public class VpnSettings extends PreferenceActivity implements 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; |