Snap for 10825434 from 901956663dac74ba7ade678f7796b6d6043b4fba to udc-qpr1-release (8fda98a0) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityTaskManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ interface IActivityTaskManager {
		* {@link android.view.WindowManagerPolicyConstants#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE}
		* etc.
		*/
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.CONTROL_KEYGUARD)")
		void keyguardGoingAway(int flags);

		void suppressResizeConfigChanges(boolean suppress);

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

+28 −0

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

		/**
		* Returns the list of {@link EnforcingAdmin}s who have set this restriction.
		*
		* <p>Note that for {@link #POLICY_SUSPEND_PACKAGES} it returns the PO or DO to keep the
		* behavior the same as before the bug fix for b/192245204.
		*
		* <p>This API is only callable by the system UID
		*
		* @param userId The user for whom to retrieve the information.
		* @param restriction The restriction enforced by admins. It could be any user restriction or
		* policy like {@link DevicePolicyManager#POLICY_DISABLE_CAMERA} and
		* {@link DevicePolicyManager#POLICY_DISABLE_SCREEN_CAPTURE}.
		*
		* @hide
		*/
		public @NonNull Set<EnforcingAdmin> getEnforcingAdminsForRestriction(int userId,
		@NonNull String restriction) {
		if (mService != null) {
		try {
		return new HashSet<>(mService.getEnforcingAdminsForRestriction(
		userId, restriction));
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		return null;
		}

		/**
		* Hide or unhide packages. When a package is hidden it is unavailable for use, but the data and
		* actual package file remain. This function can be called by a device owner, profile owner, or

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

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app.admin;

		parcelable EnforcingAdmin;
		No newline at end of file

core/java/android/app/admin/EnforcingAdmin.java

+26 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.app.admin;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.content.ComponentName;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.UserHandle;
		@@ -37,6 +38,11 @@ public final class EnforcingAdmin implements Parcelable {
		private final Authority mAuthority;
		private final UserHandle mUserHandle;

		/**
		* @hide
		*/
		private final ComponentName mComponentName;

		/**
		* Creates an enforcing admin with the given params.
		*/
		@@ -46,6 +52,21 @@ public final class EnforcingAdmin implements Parcelable {
		mPackageName = Objects.requireNonNull(packageName);
		mAuthority = Objects.requireNonNull(authority);
		mUserHandle = Objects.requireNonNull(userHandle);
		mComponentName = null;
		}

		/**
		* Creates an enforcing admin with the given params.
		*
		* @hide
		*/
		public EnforcingAdmin(
		@NonNull String packageName, @NonNull Authority authority,
		@NonNull UserHandle userHandle, @Nullable ComponentName componentName) {
		mPackageName = Objects.requireNonNull(packageName);
		mAuthority = Objects.requireNonNull(authority);
		mUserHandle = Objects.requireNonNull(userHandle);
		mComponentName = componentName;
		}

		private EnforcingAdmin(Parcel source) {
		@@ -53,6 +74,7 @@ public final class EnforcingAdmin implements Parcelable {
		mUserHandle = new UserHandle(source.readInt());
		mAuthority = Objects.requireNonNull(
		source.readParcelable(Authority.class.getClassLoader()));
		mComponentName = source.readParcelable(ComponentName.class.getClassLoader());
		}

		/**
		@@ -86,7 +108,8 @@ public final class EnforcingAdmin implements Parcelable {
		EnforcingAdmin other = (EnforcingAdmin) o;
		return Objects.equals(mPackageName, other.mPackageName)
		&& Objects.equals(mAuthority, other.mAuthority)
		&& Objects.equals(mUserHandle, other.mUserHandle);
		&& Objects.equals(mUserHandle, other.mUserHandle)
		&& Objects.equals(mComponentName, other.mComponentName);
		}

		@Override
		@@ -97,7 +120,7 @@ public final class EnforcingAdmin implements Parcelable {
		@Override
		public String toString() {
		return "EnforcingAdmin { mPackageName= " + mPackageName + ", mAuthority= " + mAuthority
		+ ", mUserHandle= " + mUserHandle + " }";
		+ ", mUserHandle= " + mUserHandle + ", mComponentName= " + mComponentName + " }";
		}

		@Override
		@@ -110,6 +133,7 @@ public final class EnforcingAdmin implements Parcelable {
		dest.writeString(mPackageName);
		dest.writeInt(mUserHandle.getIdentifier());
		dest.writeParcelable(mAuthority, flags);
		dest.writeParcelable(mComponentName, flags);
		}

		@NonNull

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import android.security.keystore.ParcelableKeyGenParameterSpec;
		import android.telephony.data.ApnSetting;
		import com.android.internal.infra.AndroidFuture;
		import android.app.admin.DevicePolicyState;
		import android.app.admin.EnforcingAdmin;

		import java.util.List;

		@@ -274,6 +275,7 @@ interface IDevicePolicyManager {

		Intent createAdminSupportIntent(in String restriction);
		Bundle getEnforcingAdminAndUserDetails(int userId,String restriction);
		List<EnforcingAdmin> getEnforcingAdminsForRestriction(int userId,String restriction);
		boolean setApplicationHidden(in ComponentName admin, in String callerPackage, in String packageName, boolean hidden, boolean parent);
		boolean isApplicationHidden(in ComponentName admin, in String callerPackage, in String packageName, boolean parent);