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

Merge "Less intrusive VPN dialog." into lmp-dev

Browse Source
This commit is contained in:
Jeff Davidson
2014-08-20 23:59:30 +00:00
committed by Android (Google) Code Review
parent e847e7ef56 90b3b211ef
commit 4e064343b3
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/AppOpsState.java
View File

@@ -190,13 +190,15 @@ public class AppOpsState {
AppOpsManager.OP_WRITE_SETTINGS,
AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
AppOpsManager.OP_WAKE_LOCK,
AppOpsManager.OP_PROJECT_MEDIA },
AppOpsManager.OP_PROJECT_MEDIA,
AppOpsManager.OP_ACTIVATE_VPN, },
new boolean[] { false,
true,
true,
true,
true,
true,
false,
false, }
);

12
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -45,8 +45,10 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
@@ -56,7 +58,6 @@ import com.android.internal.net.VpnProfile;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.google.android.collect.Lists;
import java.util.ArrayList;
@@ -349,15 +350,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements
if (preference instanceof VpnPreference) {
VpnProfile profile = ((VpnPreference) preference).getProfile();
if (mInfo != null && profile.key.equals(mInfo.key) &&
mInfo.state == LegacyVpnInfo.STATE_CONNECTED) {
try {
mInfo.intent.send();
return true;
} catch (Exception e) {
// ignore
}
}
mDialog = new VpnDialog(getActivity(), this, profile, false);
} else {
// Generate a new key. Here we just use the current time.