Snap for 7255997 from 18c04f023a529282fd38ca0036199555e248016d to rvc-qpr3-release (a12541e6) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/vpn2/AppDialogFragment.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.settings.vpn2;		package com.android.settings.vpn2;

	import android.app.Dialog;		import android.app.Dialog;
			import android.app.admin.DevicePolicyManager;
	import android.app.settings.SettingsEnums;		import android.app.settings.SettingsEnums;
	import android.content.Context;		import android.content.Context;
	import android.content.DialogInterface;		import android.content.DialogInterface;
	@@ -55,6 +56,7 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
	private UserManager mUserManager;		private UserManager mUserManager;
	private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(		private final IConnectivityManager mService = IConnectivityManager.Stub.asInterface(
	ServiceManager.getService(Context.CONNECTIVITY_SERVICE));		ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
			private DevicePolicyManager mDevicePolicyManager;

	@Override		@Override
	public int getMetricsCategory() {		public int getMetricsCategory() {
	@@ -97,7 +99,11 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
	@Override		@Override
	public void onCreate(Bundle savedInstanceState) {		public void onCreate(Bundle savedInstanceState) {
	super.onCreate(savedInstanceState);		super.onCreate(savedInstanceState);
			mPackageInfo = getArguments().getParcelable(ARG_PACKAGE);
	mUserManager = UserManager.get(getContext());		mUserManager = UserManager.get(getContext());
			mDevicePolicyManager = getContext()
			.createContextAsUser(UserHandle.of(getUserId()), /* flags= */ 0)
			.getSystemService(DevicePolicyManager.class);
	}		}

	@Override		@Override
	@@ -106,7 +112,6 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App
	final String label = args.getString(ARG_LABEL);		final String label = args.getString(ARG_LABEL);
	boolean managing = args.getBoolean(ARG_MANAGING);		boolean managing = args.getBoolean(ARG_MANAGING);
	boolean connected = args.getBoolean(ARG_CONNECTED);		boolean connected = args.getBoolean(ARG_CONNECTED);
	mPackageInfo = args.getParcelable(ARG_PACKAGE);

	if (managing) {		if (managing) {
	return new AppDialog(getActivity(), this, mPackageInfo, label);		return new AppDialog(getActivity(), this, mPackageInfo, label);
	@@ -178,7 +183,10 @@ public class AppDialogFragment extends InstrumentedDialogFragment implements App

	private boolean isUiRestricted() {		private boolean isUiRestricted() {
	final UserHandle userHandle = UserHandle.of(getUserId());		final UserHandle userHandle = UserHandle.of(getUserId());
	return mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN, userHandle);		if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN, userHandle)) {
			return true;
			}
			return mPackageInfo.packageName.equals(mDevicePolicyManager.getAlwaysOnVpnPackage());
	}		}

	private int getUserId() {		private int getUserId() {

src/com/android/settings/vpn2/AppPreference.java

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.settings.vpn2;		package com.android.settings.vpn2;

			import android.app.admin.DevicePolicyManager;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.PackageInfo;		import android.content.pm.PackageInfo;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	@@ -26,6 +27,8 @@ import androidx.preference.Preference;

	import com.android.internal.net.LegacyVpnInfo;		import com.android.internal.net.LegacyVpnInfo;
	import com.android.internal.net.VpnConfig;		import com.android.internal.net.VpnConfig;
			import com.android.settingslib.RestrictedLockUtils;
			import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

	/**		/**
	* {@link androidx.preference.Preference} containing information about a VPN		* {@link androidx.preference.Preference} containing information about a VPN
	@@ -43,6 +46,7 @@ public class AppPreference extends ManageablePreference {
	super.setUserId(userId);		super.setUserId(userId);

	mPackageName = packageName;		mPackageName = packageName;
			disableIfConfiguredByAdmin();

	// Fetch icon and VPN label		// Fetch icon and VPN label
	String label = packageName;		String label = packageName;
	@@ -74,6 +78,25 @@ public class AppPreference extends ManageablePreference {
	setIcon(icon);		setIcon(icon);
	}		}

			/**
			* Disable this preference if VPN is set as always on by a profile or device owner.
			* NB: it should be called after super.setUserId() otherwise admin information can be lost.
			*/
			private void disableIfConfiguredByAdmin() {
			if (isDisabledByAdmin()) {
			// Already disabled due to user restriction.
			return;
			}
			final DevicePolicyManager dpm = getContext()
			.createContextAsUser(UserHandle.of(getUserId()), /* flags= */ 0)
			.getSystemService(DevicePolicyManager.class);
			if (mPackageName.equals(dpm.getAlwaysOnVpnPackage())) {
			final EnforcedAdmin admin = RestrictedLockUtils.getProfileOrDeviceOwner(
			getContext(), UserHandle.of(mUserId));
			setDisabledByAdmin(admin);
			}
			}

	public PackageInfo getPackageInfo() {		public PackageInfo getPackageInfo() {
	try {		try {
	PackageManager pm = getUserContext().getPackageManager();		PackageManager pm = getUserContext().getPackageManager();