Merge "Delete TurnOffWork 2.0 code" into main (33ff2138) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -575,7 +575,6 @@ package android.app.admin {
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public boolean setDeviceOwnerOnly(@NonNull android.content.ComponentName, int);
		method public void setDeviceOwnerType(@NonNull android.content.ComponentName, int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public void setNextOperationSafety(int, int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setOverrideKeepProfilesRunning(boolean);
		method @RequiresPermission(anyOf={android.Manifest.permission.MARK_DEVICE_ORGANIZATION_OWNED, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}, conditional=true) public void setProfileOwnerOnOrganizationOwnedDevice(@NonNull android.content.ComponentName, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public boolean triggerDevicePolicyEngineMigration(boolean);
		field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";

+0 −17

Original line number	Diff line number	Diff line
		@@ -17047,23 +17047,6 @@ public class DevicePolicyManager {
		return null;
		}

		/**
		* Overrides the effective cached value of enable_keep_profiles_running for testing purposes.
		*
		* @hide
		*/
		@TestApi
		@RequiresPermission(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)
		public void setOverrideKeepProfilesRunning(boolean enabled) {
		if (mService != null) {
		try {
		mService.setOverrideKeepProfilesRunning(enabled);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

		/**
		* Triggers the data migration of device policies for existing DPCs to the Device Policy Engine.
		* If {@code forceMigration} is set to {@code true} it skips the prerequisite checks before

+0 −10

Original line number	Diff line number	Diff line
		@@ -311,21 +311,11 @@ public abstract class DevicePolicyManagerInternal {
		public abstract boolean hasPermission(String callerPackage, String permission,
		int targetUserId);

		/**
		* Returns whether new "turn off work" behavior is enabled via feature flag.
		*/
		public abstract boolean isKeepProfilesRunningEnabled();

		/**
		* True if either the entire device or the user is organization managed.
		*/
		public abstract boolean isUserOrganizationManaged(@UserIdInt int userId);

		/**
		* Returns the list of packages suspended by admin on a given user.
		*/
		public abstract Set<String> getPackagesSuspendedByAdmin(@UserIdInt int userId);

		/**
		* Returns whether the application exemptions feature flag is enabled.
		*/

+0 −2

Original line number	Diff line number	Diff line
		@@ -603,8 +603,6 @@ interface IDevicePolicyManager {

		DevicePolicyState getDevicePolicyState();

		void setOverrideKeepProfilesRunning(boolean enabled);

		boolean triggerDevicePolicyEngineMigration(boolean forceMigration);

		boolean isDeviceFinanced(String callerPackageName);

+0 −8

Original line number	Diff line number	Diff line
		@@ -299,14 +299,6 @@ public abstract class PackageManagerInternal {
		public abstract String[] setPackagesSuspendedByAdmin(
		@UserIdInt int userId, @NonNull String[] packageNames, boolean suspended);

		/**
		* Suspend or unsuspend packages in a profile when quiet mode is toggled.
		*
		* @param userId The target user.
		* @param suspended Whether the packages should be suspended or unsuspended.
		*/
		public abstract void setPackagesSuspendedForQuietMode(@UserIdInt int userId, boolean suspended);

		/**
		* Get the information describing the dialog to be shown to the user when they try to launch a
		* suspended application.