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

Disable always-on VPN options if an app has opted out.

Browse Source 
The user can turn on / off always-on for individual VPN apps in
Settings > Network > VPN. Now that we're providing an opt-out of the
always-on feature for VPN apps, we should disabled the toggles if the
VPN app has an explicit opt-out.

Related unit tests are also removed as the check is now performed in the
frameworks, not in Settings.

Bug: 36650087
Test: CTS Verifier

Change-Id: I486fec14a1f8b86e7120dbdbfed3885801ab4dd7
This commit is contained in:
Charles He
2017-06-08 17:15:32 +01:00
parent 446f2d2896
commit fc1ce57b13
2 changed files with 13 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -15,6 +15,8 @@
*/
package com.android.settings.vpn2;
import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
import android.annotation.NonNull;
import android.app.AlertDialog;
import android.app.AppOpsManager;
@@ -27,7 +29,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.ConnectivityManager;
import android.net.IConnectivityManager;
import android.os.Build;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -45,13 +46,11 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.RestrictedSwitchPreference;
import java.util.List;
import static android.app.AppOpsManager.OP_ACTIVATE_VPN;
public class AppManagementFragment extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
ConfirmLockdownFragment.ConfirmLockdownListener {
@@ -223,19 +222,6 @@ public class AppManagementFragment extends SettingsPreferenceFragment
isEnabled ? mPackageName : null, isLockdown);
}
@VisibleForTesting
static boolean isAlwaysOnSupportedByApp(@NonNull ApplicationInfo appInfo) {
final int targetSdk = appInfo.targetSdkVersion;
if (targetSdk < Build.VERSION_CODES.N) {
if (Log.isLoggable(TAG, Log.DEBUG)) {
Log.d(TAG, "Package " + appInfo.packageName + " targets SDK version: " + targetSdk
+ "; must target at least " + Build.VERSION_CODES.N + " to use always-on.");
}
return false;
}
return true;
}
private void updateUI() {
if (isAdded()) {
final boolean alwaysOn = isVpnAlwaysOn();
@@ -257,7 +243,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
mPreferenceForget.checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN,
mUserId);
if (isAlwaysOnSupportedByApp(mPackageInfo.applicationInfo)) {
if (mConnectivityManager.isAlwaysOnVpnPackageSupportedForUser(mUserId, mPackageName)) {
// setSummary doesn't override the admin message when user restriction is applied
mPreferenceAlwaysOn.setSummary(R.string.vpn_always_on_summary);
// setEnabled is not required here, as checkRestrictionAndSetDisabled