Merge "Change MeteredDataDisabled function names for clarity" into pi-dev (631f55ba) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -6459,7 +6459,7 @@ package android.app.admin {
		method public android.content.ComponentName getMandatoryBackupTransport();
		method public int getMaximumFailedPasswordsForWipe(android.content.ComponentName);
		method public long getMaximumTimeToLock(android.content.ComponentName);
		method public java.util.List<java.lang.String> getMeteredDataDisabled(android.content.ComponentName);
		method public java.util.List<java.lang.String> getMeteredDataDisabledPackages(android.content.ComponentName);
		method public int getOrganizationColor(android.content.ComponentName);
		method public java.lang.CharSequence getOrganizationName(android.content.ComponentName);
		method public java.util.List<android.telephony.data.ApnSetting> getOverrideApns(android.content.ComponentName);
		@@ -6567,7 +6567,7 @@ package android.app.admin {
		method public void setMasterVolumeMuted(android.content.ComponentName, boolean);
		method public void setMaximumFailedPasswordsForWipe(android.content.ComponentName, int);
		method public void setMaximumTimeToLock(android.content.ComponentName, long);
		method public java.util.List<java.lang.String> setMeteredDataDisabled(android.content.ComponentName, java.util.List<java.lang.String>);
		method public java.util.List<java.lang.String> setMeteredDataDisabledPackages(android.content.ComponentName, java.util.List<java.lang.String>);
		method public void setNetworkLoggingEnabled(android.content.ComponentName, boolean);
		method public void setOrganizationColor(android.content.ComponentName, int);
		method public void setOrganizationName(android.content.ComponentName, java.lang.CharSequence);

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -8382,12 +8382,12 @@ public class DevicePolicyManager {
		* @return a list of package names which could not be restricted.
		* @throws SecurityException if {@code admin} is not a device or profile owner.
		*/
		public @NonNull List<String> setMeteredDataDisabled(@NonNull ComponentName admin,
		public @NonNull List<String> setMeteredDataDisabledPackages(@NonNull ComponentName admin,
		@NonNull List<String> packageNames) {
		throwIfParentInstance("setMeteredDataDisabled");
		if (mService != null) {
		try {
		return mService.setMeteredDataDisabled(admin, packageNames);
		return mService.setMeteredDataDisabledPackages(admin, packageNames);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		@@ -8403,11 +8403,11 @@ public class DevicePolicyManager {
		* @return the list of restricted package names.
		* @throws SecurityException if {@code admin} is not a device or profile owner.
		*/
		public @NonNull List<String> getMeteredDataDisabled(@NonNull ComponentName admin) {
		public @NonNull List<String> getMeteredDataDisabledPackages(@NonNull ComponentName admin) {
		throwIfParentInstance("getMeteredDataDisabled");
		if (mService != null) {
		try {
		return mService.getMeteredDataDisabled(admin);
		return mService.getMeteredDataDisabledPackages(admin);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}
		@@ -8426,12 +8426,12 @@ public class DevicePolicyManager {
		* @throws SecurityException if the caller doesn't run with {@link Process#SYSTEM_UID}
		* @hide
		*/
		public boolean isMeteredDataDisabledForUser(@NonNull ComponentName admin, String packageName,
		@UserIdInt int userId) {
		public boolean isMeteredDataDisabledPackageForUser(@NonNull ComponentName admin,
		String packageName, @UserIdInt int userId) {
		throwIfParentInstance("getMeteredDataDisabledForUser");
		if (mService != null) {
		try {
		return mService.isMeteredDataDisabledForUser(admin, packageName, userId);
		return mService.isMeteredDataDisabledPackageForUser(admin, packageName, userId);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -404,8 +404,8 @@ interface IDevicePolicyManager {
		CharSequence getStartUserSessionMessage(in ComponentName admin);
		CharSequence getEndUserSessionMessage(in ComponentName admin);

		List<String> setMeteredDataDisabled(in ComponentName admin, in List<String> packageNames);
		List<String> getMeteredDataDisabled(in ComponentName admin);
		List<String> setMeteredDataDisabledPackages(in ComponentName admin, in List<String> packageNames);
		List<String> getMeteredDataDisabledPackages(in ComponentName admin);

		int addOverrideApn(in ComponentName admin, in ApnSetting apnSetting);
		boolean updateOverrideApn(in ComponentName admin, int apnId, in ApnSetting apnSetting);
		@@ -414,5 +414,5 @@ interface IDevicePolicyManager {
		void setOverrideApnsEnabled(in ComponentName admin, boolean enabled);
		boolean isOverrideApnEnabled(in ComponentName admin);

		boolean isMeteredDataDisabledForUser(in ComponentName admin, String packageName, int userId);
		boolean isMeteredDataDisabledPackageForUser(in ComponentName admin, String packageName, int userId);
		}

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -378,7 +378,7 @@ public class RestrictedLockUtils {

		final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
		Context.DEVICE_POLICY_SERVICE);
		return dpm.isMeteredDataDisabledForUser(enforcedAdmin.component, packageName, userId)
		return dpm.isMeteredDataDisabledPackageForUser(enforcedAdmin.component, packageName, userId)
		? enforcedAdmin : null;
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -122,12 +122,12 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {
		}

		@Override
		public List<String> setMeteredDataDisabled(ComponentName admin, List<String> packageNames) {
		public List<String> setMeteredDataDisabledPackages(ComponentName admin, List<String> packageNames) {
		return packageNames;
		}

		@Override
		public List<String> getMeteredDataDisabled(ComponentName admin) {
		public List<String> getMeteredDataDisabledPackages(ComponentName admin) {
		return new ArrayList<>();
		}

		@@ -163,7 +163,7 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub {
		}

		@Override
		public boolean isMeteredDataDisabledForUser(ComponentName admin,
		public boolean isMeteredDataDisabledPackageForUser(ComponentName admin,
		String packageName, int userId) {
		return false;
		}