PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix VPN profile path in settings.

Browse Source 
http://b/issue?id=2485656

...and eliminate multiple Settings instances in history stack

Change-Id: I076b78781ee7ce458f82e6d9659a94ce64841a0e
This commit is contained in:
Hung-ying Tyan
2010-03-09 12:25:01 +08:00
parent f69dcab6ac
commit 488dc08b0b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -189,7 +189,7 @@
<activity android:name=".vpn.VpnSettings" <activity android:name=".vpn.VpnSettings"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:launchMode="singleTask"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.net.vpn.SETTINGS" /> <action android:name="android.net.vpn.SETTINGS" />

2
src/com/android/settings/vpn/VpnSettings.java
View File

@@ -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_ADD_VPN = "add_new_vpn";
private static final String PREF_VPN_LIST = "vpn_list"; 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 String PROFILE_OBJ_FILE = ".pobj";
private static final int REQUEST_ADD_OR_EDIT_PROFILE = 1; private static final int REQUEST_ADD_OR_EDIT_PROFILE = 1;