Snap for 8417597 from d4e7e2336adf8d10cdd9ab321be7933af6f05c1c to sc-qpr3-release (030973ca) · Commits · e / os / android_frameworks_base

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

+22 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.app.admin;
		import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

		import android.Manifest.permission;
		import android.accounts.Account;
		import android.annotation.CallbackExecutor;
		import android.annotation.ColorInt;
		import android.annotation.IntDef;
		@@ -165,6 +166,27 @@ public class DevicePolicyManager {
		this(context, service, false);
		}

		/**
		* Called when a managed profile has been provisioned.
		*
		* @throws SecurityException if the caller does not hold
		* {@link android.Manifest.permission#MANAGE_PROFILE_AND_DEVICE_OWNERS}.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)
		public void finalizeWorkProfileProvisioning(
		@NonNull UserHandle managedProfileUser, @Nullable Account migratedAccount) {
		Objects.requireNonNull(managedProfileUser, "managedProfileUser can't be null");
		if (mService == null) {
		throw new IllegalStateException("Could not find DevicePolicyManagerService");
		}
		try {
		mService.finalizeWorkProfileProvisioning(managedProfileUser, migratedAccount);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/** @hide */
		@VisibleForTesting
		protected DevicePolicyManager(Context context, IDevicePolicyManager service,

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@

		package android.app.admin;

		import android.accounts.Account;
		import android.app.admin.NetworkEvent;
		import android.app.IApplicationThread;
		import android.app.IServiceConnection;
		@@ -97,6 +98,8 @@ interface IDevicePolicyManager {
		int getCurrentFailedPasswordAttempts(int userHandle, boolean parent);
		int getProfileWithMinimumFailedPasswordsForWipe(int userHandle, boolean parent);

		void finalizeWorkProfileProvisioning(in UserHandle managedProfileUser, in Account migratedAccount);

		void setMaximumFailedPasswordsForWipe(in ComponentName admin, int num, boolean parent);
		int getMaximumFailedPasswordsForWipe(in ComponentName admin, int userHandle, boolean parent);

+1 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,7 @@ public final class Parcel {
		*/
		public final void recycle() {
		if (DEBUG_RECYCLE) mStack = null;
		mClassCookies = null;
		freeBuffer();

		if (mOwnsNativeParcelObject) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ interface IWindowSession {
		*/
		void grantInputChannel(int displayId, in SurfaceControl surface, in IWindow window,
		in IBinder hostInputToken, int flags, int privateFlags, int type,
		out InputChannel outInputChannel);
		in IBinder focusGrantToken, out InputChannel outInputChannel);

		/**
		* Update the flags on an input channel associated with a particular surface.

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ public class SurfaceControlViewHost {
		public @Nullable SurfacePackage getSurfacePackage() {
		if (mSurfaceControl != null && mAccessibilityEmbeddedConnection != null) {
		return new SurfacePackage(mSurfaceControl, mAccessibilityEmbeddedConnection,
		mViewRoot.getInputToken());
		mWm.getFocusGrantToken());
		} else {
		return null;
		}