Merge "Rename lockdown admin configured networks API" (7ab8a283) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -6917,6 +6917,7 @@ package android.app.admin {
		method public boolean grantKeyPairToApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);
		method public boolean hasCaCertInstalled(@Nullable android.content.ComponentName, byte[]);
		method public boolean hasGrantedPolicy(@NonNull android.content.ComponentName, int);
		method public boolean hasLockdownAdminConfiguredNetworks(@NonNull android.content.ComponentName);
		method public boolean installCaCert(@Nullable android.content.ComponentName, byte[]);
		method public boolean installExistingPackage(@NonNull android.content.ComponentName, String);
		method public boolean installKeyPair(@Nullable android.content.ComponentName, @NonNull java.security.PrivateKey, @NonNull java.security.cert.Certificate, @NonNull String);
		@@ -6935,7 +6936,6 @@ package android.app.admin {
		method public boolean isDeviceOwnerApp(String);
		method public boolean isEphemeralUser(@NonNull android.content.ComponentName);
		method public boolean isLockTaskPermitted(String);
		method public boolean isLockdownAdminConfiguredNetworks(@NonNull android.content.ComponentName);
		method public boolean isLogoutEnabled();
		method public boolean isManagedProfile(@NonNull android.content.ComponentName);
		method public boolean isMasterVolumeMuted(@NonNull android.content.ComponentName);
		@@ -6982,6 +6982,7 @@ package android.app.admin {
		method public void setCameraDisabled(@NonNull android.content.ComponentName, boolean);
		method @Deprecated public void setCertInstallerPackage(@NonNull android.content.ComponentName, @Nullable String) throws java.lang.SecurityException;
		method public void setCommonCriteriaModeEnabled(@NonNull android.content.ComponentName, boolean);
		method public void setConfiguredNetworksLockdownState(@NonNull android.content.ComponentName, boolean);
		method public void setCrossProfileCalendarPackages(@NonNull android.content.ComponentName, @Nullable java.util.Set<java.lang.String>);
		method public void setCrossProfileCallerIdDisabled(@NonNull android.content.ComponentName, boolean);
		method public void setCrossProfileContactsSearchDisabled(@NonNull android.content.ComponentName, boolean);
		@@ -7001,7 +7002,6 @@ package android.app.admin {
		method public void setLocationEnabled(@NonNull android.content.ComponentName, boolean);
		method public void setLockTaskFeatures(@NonNull android.content.ComponentName, int);
		method public void setLockTaskPackages(@NonNull android.content.ComponentName, @NonNull String[]) throws java.lang.SecurityException;
		method public void setLockdownAdminConfiguredNetworks(@NonNull android.content.ComponentName, boolean);
		method public void setLogoutEnabled(@NonNull android.content.ComponentName, boolean);
		method public void setLongSupportMessage(@NonNull android.content.ComponentName, @Nullable CharSequence);
		method public void setManagedProfileMaximumTimeOff(@NonNull android.content.ComponentName, long);

core/java/android/app/admin/DevicePolicyManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -8789,11 +8789,11 @@ public class DevicePolicyManager {
		* @throws SecurityException if caller is not a device owner or a profile owner of an
		* organization-owned managed profile.
		*/
		public void setLockdownAdminConfiguredNetworks(@NonNull ComponentName admin, boolean lockdown) {
		throwIfParentInstance("setLockdownAdminConfiguredNetworks");
		public void setConfiguredNetworksLockdownState(@NonNull ComponentName admin, boolean lockdown) {
		throwIfParentInstance("setConfiguredNetworksLockdownState");
		if (mService != null) {
		try {
		mService.setLockdownAdminConfiguredNetworks(admin, lockdown);
		mService.setConfiguredNetworksLockdownState(admin, lockdown);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -8809,11 +8809,11 @@ public class DevicePolicyManager {
		* @throws SecurityException if caller is not a device owner or a profile owner of an
		* organization-owned managed profile.
		*/
		public boolean isLockdownAdminConfiguredNetworks(@NonNull ComponentName admin) {
		throwIfParentInstance("setLockdownAdminConfiguredNetworks");
		public boolean hasLockdownAdminConfiguredNetworks(@NonNull ComponentName admin) {
		throwIfParentInstance("hasLockdownAdminConfiguredNetworks");
		if (mService != null) {
		try {
		return mService.isLockdownAdminConfiguredNetworks(admin);
		return mService.hasLockdownAdminConfiguredNetworks(admin);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/app/admin/IDevicePolicyManager.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -266,8 +266,8 @@ interface IDevicePolicyManager {
		void setSystemSetting(in ComponentName who, in String setting, in String value);
		void setSecureSetting(in ComponentName who, in String setting, in String value);

		void setLockdownAdminConfiguredNetworks(in ComponentName who, boolean lockdown);
		boolean isLockdownAdminConfiguredNetworks(in ComponentName who);
		void setConfiguredNetworksLockdownState(in ComponentName who, boolean lockdown);
		boolean hasLockdownAdminConfiguredNetworks(in ComponentName who);

		void setLocationEnabled(in ComponentName who, boolean locationEnabled);
		void requestSetLocationProviderAllowed(in ComponentName who, in String provider, boolean providerAllowed);

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -11553,7 +11553,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		@Override
		public void setLockdownAdminConfiguredNetworks(ComponentName who, boolean lockdown) {
		public void setConfiguredNetworksLockdownState(ComponentName who, boolean lockdown) {
		if (!mHasFeature) {
		return;
		}
		@@ -11572,7 +11572,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}

		@Override
		public boolean isLockdownAdminConfiguredNetworks(ComponentName who) {
		public boolean hasLockdownAdminConfiguredNetworks(ComponentName who) {
		if (!mHasFeature) {
		return false;
		}

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -3781,35 +3781,35 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		assertEquals(-1, dpm.getLastSecurityLogRetrievalTime());
		}

		public void testSetLockdownAdminConfiguredNetworksWithDO() throws Exception {
		public void testSetConfiguredNetworksLockdownStateWithDO() throws Exception {
		mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;
		setupDeviceOwner();
		dpm.setLockdownAdminConfiguredNetworks(admin1, true);
		dpm.setConfiguredNetworksLockdownState(admin1, true);
		verify(getServices().settings).settingsGlobalPutInt(
		Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 1);

		dpm.setLockdownAdminConfiguredNetworks(admin1, false);
		dpm.setConfiguredNetworksLockdownState(admin1, false);
		verify(getServices().settings).settingsGlobalPutInt(
		Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0);
		}

		public void testSetLockdownAdminConfiguredNetworksWithPO() throws Exception {
		public void testSetConfiguredNetworksLockdownStateWithPO() throws Exception {
		setupProfileOwner();
		assertExpectException(SecurityException.class, null,
		() -> dpm.setLockdownAdminConfiguredNetworks(admin1, false));
		() -> dpm.setConfiguredNetworksLockdownState(admin1, false));
		verify(getServices().settings, never()).settingsGlobalPutInt(
		Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0);
		}

		public void testSetLockdownAdminConfiguredNetworksWithPOOfOrganizationOwnedDevice()
		public void testSetConfiguredNetworksLockdownStateWithPOOfOrganizationOwnedDevice()
		throws Exception {
		setupProfileOwner();
		configureProfileOwnerOfOrgOwnedDevice(admin1, DpmMockContext.CALLER_USER_HANDLE);
		dpm.setLockdownAdminConfiguredNetworks(admin1, true);
		dpm.setConfiguredNetworksLockdownState(admin1, true);
		verify(getServices().settings).settingsGlobalPutInt(
		Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 1);

		dpm.setLockdownAdminConfiguredNetworks(admin1, false);
		dpm.setConfiguredNetworksLockdownState(admin1, false);
		verify(getServices().settings).settingsGlobalPutInt(
		Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0);
		}