Merge "Remove @Deprecated && @removed methods from DevicePolicyManager." (892aa966) · Commits · e / os / android_frameworks_base

api/removed.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -23,15 +23,6 @@ package android.app {

		}

		package android.app.admin {

		public class DevicePolicyManager {
		method @Deprecated @Nullable public android.os.UserHandle createAndInitializeUser(@NonNull android.content.ComponentName, String, String, @NonNull android.content.ComponentName, android.os.Bundle);
		method @Deprecated @Nullable public android.os.UserHandle createUser(@NonNull android.content.ComponentName, String);
		}

		}

		package android.app.slice {

		public final class Slice implements android.os.Parcelable {

api/system-removed.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -23,15 +23,6 @@ package android.app {

		}

		package android.app.admin {

		public class DevicePolicyManager {
		method @Deprecated @Nullable public String getDeviceInitializerApp();
		method @Deprecated @Nullable public android.content.ComponentName getDeviceInitializerComponent();
		}

		}

		package android.app.backup {

		public class RestoreSession {

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

+0 −78

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

		/**
		* @hide
		* @deprecated Do not use
		* @removed
		*/
		@Deprecated
		@SystemApi
		@SuppressLint("Doclava125")
		public @Nullable String getDeviceInitializerApp() {
		return null;
		}

		/**
		* @hide
		* @deprecated Do not use
		* @removed
		*/
		@Deprecated
		@SystemApi
		@SuppressLint("Doclava125")
		public @Nullable ComponentName getDeviceInitializerComponent() {
		return null;
		}

		/**
		* @hide
		* @deprecated Use #ACTION_SET_PROFILE_OWNER
		@@ -7393,60 +7369,6 @@ public class DevicePolicyManager {
		}
		}

		/**
		* Called by a device owner to create a user with the specified name. The UserHandle returned
		* by this method should not be persisted as user handles are recycled as users are removed and
		* created. If you need to persist an identifier for this user, use
		* {@link UserManager#getSerialNumberForUser}.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @param name the user's name
		* @see UserHandle
		* @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the
		* user could not be created.
		*
		* @deprecated From {@link android.os.Build.VERSION_CODES#M}
		* @removed From {@link android.os.Build.VERSION_CODES#N}
		*/
		@Deprecated
		public @Nullable UserHandle createUser(@NonNull ComponentName admin, String name) {
		return null;
		}

		/**
		* Called by a device owner to create a user with the specified name. The UserHandle returned
		* by this method should not be persisted as user handles are recycled as users are removed and
		* created. If you need to persist an identifier for this user, use
		* {@link UserManager#getSerialNumberForUser}. The new user will be started in the background
		* immediately.
		*
		* <p> profileOwnerComponent is the {@link DeviceAdminReceiver} to be the profile owner as well
		* as registered as an active admin on the new user. The profile owner package will be
		* installed on the new user if it already is installed on the device.
		*
		* <p>If the optionalInitializeData is not null, then the extras will be passed to the
		* profileOwnerComponent when onEnable is called.
		*
		* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
		* @param name the user's name
		* @param ownerName the human readable name of the organisation associated with this DPM.
		* @param profileOwnerComponent The {@link DeviceAdminReceiver} that will be an active admin on
		* the user.
		* @param adminExtras Extras that will be passed to onEnable of the admin receiver
		* on the new user.
		* @see UserHandle
		* @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the
		* user could not be created.
		*
		* @deprecated From {@link android.os.Build.VERSION_CODES#M}
		* @removed From {@link android.os.Build.VERSION_CODES#N}
		*/
		@Deprecated
		public @Nullable UserHandle createAndInitializeUser(@NonNull ComponentName admin, String name,
		String ownerName, @NonNull ComponentName profileOwnerComponent, Bundle adminExtras) {
		return null;
		}

		/**
		* Flag used by {@link #createAndManageUser} to skip setup wizard after creating a new user.
		*/