Merge changes from topic "overrideDrawables" (3c71e8fe) · Commits · e / os / android_frameworks_base

core/api/current.txt

+36 −0

Original line number	Diff line number	Diff line
		@@ -7286,6 +7286,10 @@ package android.app.admin {
		method @Nullable public java.util.List<java.lang.String> getDelegatePackages(@NonNull android.content.ComponentName, @NonNull String);
		method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String);
		method public CharSequence getDeviceOwnerLockScreenInfo();
		method @Nullable public android.graphics.drawable.Drawable getDrawable(int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
		method @Nullable public android.graphics.drawable.Drawable getDrawable(int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
		method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
		method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(int, int, int, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);
		method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName);
		method @NonNull public String getEnrollmentSpecificId();
		method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);
		@@ -7509,6 +7513,7 @@ package android.app.admin {
		field public static final String ACTION_CHECK_POLICY_COMPLIANCE = "android.app.action.CHECK_POLICY_COMPLIANCE";
		field public static final String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";
		field public static final String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED";
		field public static final String ACTION_DEVICE_POLICY_RESOURCE_UPDATED = "android.app.action.DEVICE_POLICY_RESOURCE_UPDATED";
		field public static final String ACTION_GET_PROVISIONING_MODE = "android.app.action.GET_PROVISIONING_MODE";
		field public static final String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";
		field public static final String ACTION_PROFILE_OWNER_CHANGED = "android.app.action.PROFILE_OWNER_CHANGED";
		@@ -7584,6 +7589,8 @@ package android.app.admin {
		field public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";
		field public static final String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";
		field public static final String EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_USER_CERTIFICATE";
		field public static final String EXTRA_RESOURCE_ID = "android.app.extra.RESOURCE_ID";
		field public static final String EXTRA_RESOURCE_TYPE_DRAWABLE = "android.app.extra.RESOURCE_TYPE_DRAWABLE";
		field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1
		field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2
		field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1
		@@ -7678,6 +7685,35 @@ package android.app.admin {
		method public void onApplicationUserDataCleared(String, boolean);
		}

		public final class DevicePolicyResources {
		ctor public DevicePolicyResources();
		}

		public static final class DevicePolicyResources.Drawable {
		field public static final int INVALID_ID = -1; // 0xffffffff
		field public static final int WORK_PROFILE_ICON = 1; // 0x1
		field public static final int WORK_PROFILE_ICON_BADGE = 0; // 0x0
		field public static final int WORK_PROFILE_OFF_ICON = 2; // 0x2
		field public static final int WORK_PROFILE_USER_ICON = 3; // 0x3
		}

		public static final class DevicePolicyResources.Drawable.Source {
		field public static final int HOME_WIDGET = 2; // 0x2
		field public static final int LAUNCHER_OFF_BUTTON = 3; // 0x3
		field public static final int NOTIFICATION = 0; // 0x0
		field public static final int PROFILE_SWITCH_ANIMATION = 1; // 0x1
		field public static final int QUICK_SETTINGS = 4; // 0x4
		field public static final int STATUS_BAR = 5; // 0x5
		field public static final int UNDEFINED = -1; // 0xffffffff
		}

		public static final class DevicePolicyResources.Drawable.Style {
		field public static final int DEFAULT = -1; // 0xffffffff
		field public static final int OUTLINE = 2; // 0x2
		field public static final int SOLID_COLORED = 0; // 0x0
		field public static final int SOLID_NOT_COLORED = 1; // 0x1
		}

		public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
		method public String getHostname();
		method public java.util.List<java.net.InetAddress> getInetAddresses();

core/api/system-current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -993,6 +993,18 @@ package android.app {

		package android.app.admin {

		public final class DevicePolicyDrawableResource implements android.os.Parcelable {
		ctor public DevicePolicyDrawableResource(@NonNull android.content.Context, int, int, int, @DrawableRes int);
		ctor public DevicePolicyDrawableResource(@NonNull android.content.Context, int, int, @DrawableRes int);
		method public int describeContents();
		method @DrawableRes public int getCallingPackageResourceId();
		method public int getDrawableId();
		method public int getDrawableSource();
		method public int getDrawableStyle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DevicePolicyDrawableResource> CREATOR;
		}

		public class DevicePolicyKeyguardService extends android.app.Service {
		ctor public DevicePolicyKeyguardService();
		method @Nullable public void dismiss();
		@@ -1025,8 +1037,10 @@ package android.app.admin {
		method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String);
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
		method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void resetDrawables(@NonNull int[]);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException;
		method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied();
		method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES) public void setDrawables(@NonNull java.util.Set<android.app.admin.DevicePolicyDrawableResource>);
		method @Deprecated @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName);
		method public void setSecondaryLockscreenEnabled(@NonNull android.content.ComponentName, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void setUserProvisioningState(int, @NonNull android.os.UserHandle);

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

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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 DevicePolicyDrawableResource;

core/java/android/app/admin/DevicePolicyDrawableResource.java

0 → 100644

+203 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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;

		import android.annotation.DrawableRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.Objects;

		/**
		* Used to pass in the required information for updating an enterprise drawable resource using
		* {@link DevicePolicyManager#setDrawables}.
		*
		* @hide
		*/
		@SystemApi
		public final class DevicePolicyDrawableResource implements Parcelable {
		private final @DevicePolicyResources.UpdatableDrawableId int mDrawableId;
		private final @DevicePolicyResources.UpdatableDrawableStyle int mDrawableStyle;
		private final @DevicePolicyResources.UpdatableDrawableSource int mDrawableSource;
		private final @DrawableRes int mCallingPackageResourceId;
		@NonNull private ParcelableResource mResource;

		/**
		* Creates an object containing the required information for updating an enterprise drawable
		* resource using {@link DevicePolicyManager#setDrawables}.
		*
		* <p>It will be used to update the drawable defined by {@code drawableId} with style
		* {@code drawableStyle} located in source {@code drawableSource} to the drawable with ID
		* {@code callingPackageResourceId} in the calling package</p>
		*
		* @param drawableId The ID of the drawable to update.
		* @param drawableStyle The style of the drawable to update.
		* @param drawableSource The source of the drawable to update.
		* @param callingPackageResourceId The ID of the drawable resource in the calling package to
		* use as an updated resource.
		*
		* @throws IllegalStateException if the resource with ID
		* {@code callingPackageResourceId} doesn't exist in the {@code context} package.
		*/
		public DevicePolicyDrawableResource(
		@NonNull Context context,
		@DevicePolicyResources.UpdatableDrawableId int drawableId,
		@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
		@DevicePolicyResources.UpdatableDrawableSource int drawableSource,
		@DrawableRes int callingPackageResourceId) {
		this(drawableId, drawableStyle, drawableSource, callingPackageResourceId,
		new ParcelableResource(context, callingPackageResourceId,
		ParcelableResource.RESOURCE_TYPE_DRAWABLE));
		}

		private DevicePolicyDrawableResource(
		@DevicePolicyResources.UpdatableDrawableId int drawableId,
		@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
		@DevicePolicyResources.UpdatableDrawableSource int drawableSource,
		@DrawableRes int callingPackageResourceId,
		@NonNull ParcelableResource resource) {
		this.mDrawableId = drawableId;
		this.mDrawableStyle = drawableStyle;
		this.mDrawableSource = drawableSource;
		this.mCallingPackageResourceId = callingPackageResourceId;
		this.mResource = resource;
		}

		/**
		* Creates an object containing the required information for updating an enterprise drawable
		* resource using {@link DevicePolicyManager#setDrawables}.
		* <p>It will be used to update the drawable defined by {@code drawableId} with style
		* {@code drawableStyle} to the drawable with ID {@code callingPackageResourceId} in the
		* calling package</p>
		*
		* @param drawableId The ID of the drawable to update.
		* @param drawableStyle The style of the drawable to update.
		* @param callingPackageResourceId The ID of the drawable resource in the calling package to
		* use as an updated resource.
		*
		* @throws IllegalStateException if the resource with ID
		* {@code callingPackageResourceId} doesn't exist in the calling package.
		*/
		public DevicePolicyDrawableResource(
		@NonNull Context context,
		@DevicePolicyResources.UpdatableDrawableId int drawableId,
		@DevicePolicyResources.UpdatableDrawableStyle int drawableStyle,
		@DrawableRes int callingPackageResourceId) {
		this(context, drawableId, drawableStyle, DevicePolicyResources.Drawable.Source.UNDEFINED,
		callingPackageResourceId);
		}

		/**
		* Returns the ID of the drawable to update.
		*/
		@DevicePolicyResources.UpdatableDrawableId
		public int getDrawableId() {
		return mDrawableId;
		}

		/**
		* Returns the style of the drawable to update
		*/
		@DevicePolicyResources.UpdatableDrawableStyle
		public int getDrawableStyle() {
		return mDrawableStyle;
		}

		/**
		* Returns the source of the drawable to update.
		*/
		@DevicePolicyResources.UpdatableDrawableSource
		public int getDrawableSource() {
		return mDrawableSource;
		}

		/**
		* Returns the ID of the drawable resource in the calling package to use as an updated
		* resource.
		*/
		@DrawableRes
		public int getCallingPackageResourceId() {
		return mCallingPackageResourceId;
		}

		/**
		* Returns the {@link ParcelableResource} of the drawable.
		*
		* @hide
		*/
		@NonNull
		public ParcelableResource getResource() {
		return mResource;
		}

		@Override
		public boolean equals(@Nullable Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		DevicePolicyDrawableResource other = (DevicePolicyDrawableResource) o;
		return mDrawableId == other.mDrawableId
		&& mDrawableStyle == other.mDrawableStyle
		&& mDrawableSource == other.mDrawableSource
		&& mCallingPackageResourceId == other.mCallingPackageResourceId
		&& mResource.equals(other.mResource);
		}

		@Override
		public int hashCode() {
		return Objects.hash(
		mDrawableId, mDrawableStyle, mDrawableSource, mCallingPackageResourceId, mResource);
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeInt(mDrawableId);
		dest.writeInt(mDrawableStyle);
		dest.writeInt(mDrawableSource);
		dest.writeInt(mCallingPackageResourceId);
		dest.writeTypedObject(mResource, flags);
		}

		public static final @NonNull Creator<DevicePolicyDrawableResource> CREATOR =
		new Creator<DevicePolicyDrawableResource>() {
		@Override
		public DevicePolicyDrawableResource createFromParcel(Parcel in) {
		int drawableId = in.readInt();
		int drawableStyle = in.readInt();
		int drawableSource = in.readInt();
		int callingPackageResourceId = in.readInt();
		ParcelableResource resource = in.readTypedObject(ParcelableResource.CREATOR);

		return new DevicePolicyDrawableResource(
		drawableId, drawableStyle, drawableSource, callingPackageResourceId,
		resource);
		}

		@Override
		public DevicePolicyDrawableResource[] newArray(int size) {
		return new DevicePolicyDrawableResource[size];
		}
		};
		}

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

+276 −0

File changed.

Preview size limit exceeded, changes collapsed.