Merge branch 'v1-t' into 'v2.0-t' (14fbfdcc) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiDialogActivity.java

+12 −1

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

	import static android.Manifest.permission.ACCESS_FINE_LOCATION;		import static android.Manifest.permission.ACCESS_FINE_LOCATION;
			import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
	import static android.os.UserManager.DISALLOW_CONFIG_WIFI;		import static android.os.UserManager.DISALLOW_CONFIG_WIFI;

	import android.app.KeyguardManager;		import android.app.KeyguardManager;
	@@ -122,7 +123,7 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
	}		}

	super.onCreate(savedInstanceState);		super.onCreate(savedInstanceState);
	if (!isConfigWifiAllowed()) {		if (!isConfigWifiAllowed() \|\| !isAddWifiConfigAllowed()) {
	finish();		finish();
	return;		return;
	}		}
	@@ -393,6 +394,16 @@ public class WifiDialogActivity extends ObservableActivity implements WifiDialog
	return isConfigWifiAllowed;		return isConfigWifiAllowed;
	}		}

			@VisibleForTesting
			boolean isAddWifiConfigAllowed() {
			UserManager userManager = getSystemService(UserManager.class);
			if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {
			Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");
			return false;
			}
			return true;
			}

	private boolean hasWifiManager() {		private boolean hasWifiManager() {
	if (mWifiManager != null) return true;		if (mWifiManager != null) return true;
	mWifiManager = getSystemService(WifiManager.class);		mWifiManager = getSystemService(WifiManager.class);

tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java

+15 −0

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

	import static android.Manifest.permission.ACCESS_COARSE_LOCATION;		import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
	import static android.Manifest.permission.ACCESS_FINE_LOCATION;		import static android.Manifest.permission.ACCESS_FINE_LOCATION;
			import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
	import static android.os.UserManager.DISALLOW_CONFIG_WIFI;		import static android.os.UserManager.DISALLOW_CONFIG_WIFI;

	import static com.android.settings.wifi.WifiDialogActivity.REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER;		import static com.android.settings.wifi.WifiDialogActivity.REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER;
	@@ -234,6 +235,20 @@ public class WifiDialogActivityTest {
	assertThat(mActivity.isConfigWifiAllowed()).isFalse();		assertThat(mActivity.isConfigWifiAllowed()).isFalse();
	}		}

			@Test
			public void isAddWifiConfigAllowed_hasNoUserRestriction_returnTrue() {
			when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);

			assertThat(mActivity.isAddWifiConfigAllowed()).isTrue();
			}

			@Test
			public void isAddWifiConfigAllowed_hasUserRestriction_returnFalse() {
			when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);

			assertThat(mActivity.isAddWifiConfigAllowed()).isFalse();
			}

	@Test		@Test
	public void hasPermissionForResult_noCallingPackage_returnFalse() {		public void hasPermissionForResult_noCallingPackage_returnFalse() {
	when(mActivity.getCallingPackage()).thenReturn(null);		when(mActivity.getCallingPackage()).thenReturn(null);