Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev

Browse Source
This commit is contained in:
Jonathan Scott
2022-05-11 20:04:06 +00:00
committed by Android (Google) Code Review
parent 945df7d77d 00c0a92877
commit 7b11af45d1
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/java/android/app/admin/DevicePolicyResourcesManager.java
View File

@@ -26,7 +26,6 @@ import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
import android.os.RemoteException; import android.os.RemoteException;
import android.provider.DeviceConfig;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
@@ -41,9 +40,6 @@ import java.util.function.Supplier;
public class DevicePolicyResourcesManager { public class DevicePolicyResourcesManager {
private static String TAG = "DevicePolicyResourcesManager"; private static String TAG = "DevicePolicyResourcesManager";
private static String DISABLE_RESOURCES_UPDATABILITY_FLAG = "disable_resources_updatability";
private static boolean DEFAULT_DISABLE_RESOURCES_UPDATABILITY = false;
private final Context mContext; private final Context mContext;
private final IDevicePolicyManager mService; private final IDevicePolicyManager mService;
@@ -198,20 +194,16 @@ public class DevicePolicyResourcesManager {
Objects.requireNonNull(drawableSource, "drawableSource can't be null"); Objects.requireNonNull(drawableSource, "drawableSource can't be null");
Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null"); Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null");
if (drawableId.equals(DevicePolicyResources.UNDEFINED) if (drawableId.equals(DevicePolicyResources.UNDEFINED)) {
|| DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER,
DISABLE_RESOURCES_UPDATABILITY_FLAG,
DEFAULT_DISABLE_RESOURCES_UPDATABILITY)) {
return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader);
} }
if (mService != null) { if (mService != null) {
try { try {
ParcelableResource resource = mService.getDrawable( ParcelableResource resource = mService.getDrawable(
drawableId, drawableStyle, drawableSource); drawableId, drawableStyle, drawableSource);
if (resource == null) { if (resource == null) {
return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); return ParcelableResource.loadDefaultDrawable(
defaultDrawableLoader);
} }
return resource.getDrawable( return resource.getDrawable(
mContext, mContext,
@@ -295,20 +287,16 @@ public class DevicePolicyResourcesManager {
Objects.requireNonNull(drawableSource, "drawableSource can't be null"); Objects.requireNonNull(drawableSource, "drawableSource can't be null");
Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null"); Objects.requireNonNull(defaultDrawableLoader, "defaultDrawableLoader can't be null");
if (drawableId.equals(DevicePolicyResources.UNDEFINED) if (drawableId.equals(DevicePolicyResources.UNDEFINED)) {
|| DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER,
DISABLE_RESOURCES_UPDATABILITY_FLAG,
DEFAULT_DISABLE_RESOURCES_UPDATABILITY)) {
return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader);
} }
if (mService != null) { if (mService != null) {
try { try {
ParcelableResource resource = mService.getDrawable( ParcelableResource resource = mService.getDrawable(
drawableId, drawableStyle, drawableSource); drawableId, drawableStyle, drawableSource);
if (resource == null) { if (resource == null) {
return ParcelableResource.loadDefaultDrawable(defaultDrawableLoader); return ParcelableResource.loadDefaultDrawable(
defaultDrawableLoader);
} }
return resource.getDrawable(mContext, density, defaultDrawableLoader); return resource.getDrawable(mContext, density, defaultDrawableLoader);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -342,14 +330,9 @@ public class DevicePolicyResourcesManager {
Objects.requireNonNull(drawableSource, "drawableSource can't be null"); Objects.requireNonNull(drawableSource, "drawableSource can't be null");
Objects.requireNonNull(defaultIcon, "defaultIcon can't be null"); Objects.requireNonNull(defaultIcon, "defaultIcon can't be null");
if (drawableId.equals(DevicePolicyResources.UNDEFINED) if (drawableId.equals(DevicePolicyResources.UNDEFINED)) {
|| DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER,
DISABLE_RESOURCES_UPDATABILITY_FLAG,
DEFAULT_DISABLE_RESOURCES_UPDATABILITY)) {
return defaultIcon; return defaultIcon;
} }
if (mService != null) { if (mService != null) {
try { try {
ParcelableResource resource = mService.getDrawable( ParcelableResource resource = mService.getDrawable(
@@ -480,10 +463,7 @@ public class DevicePolicyResourcesManager {
Objects.requireNonNull(stringId, "stringId can't be null"); Objects.requireNonNull(stringId, "stringId can't be null");
Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null"); Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null");
if (stringId.equals(DevicePolicyResources.UNDEFINED) || DeviceConfig.getBoolean( if (stringId.equals(DevicePolicyResources.UNDEFINED)) {
DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER,
DISABLE_RESOURCES_UPDATABILITY_FLAG,
DEFAULT_DISABLE_RESOURCES_UPDATABILITY)) {
return ParcelableResource.loadDefaultString(defaultStringLoader); return ParcelableResource.loadDefaultString(defaultStringLoader);
} }
if (mService != null) { if (mService != null) {
@@ -528,10 +508,7 @@ public class DevicePolicyResourcesManager {
Objects.requireNonNull(stringId, "stringId can't be null"); Objects.requireNonNull(stringId, "stringId can't be null");
Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null"); Objects.requireNonNull(defaultStringLoader, "defaultStringLoader can't be null");
if (stringId.equals(DevicePolicyResources.UNDEFINED) || DeviceConfig.getBoolean( if (stringId.equals(DevicePolicyResources.UNDEFINED)) {
DeviceConfig.NAMESPACE_DEVICE_POLICY_MANAGER,
DISABLE_RESOURCES_UPDATABILITY_FLAG,
DEFAULT_DISABLE_RESOURCES_UPDATABILITY)) {
return ParcelableResource.loadDefaultString(defaultStringLoader); return ParcelableResource.loadDefaultString(defaultStringLoader);
} }
if (mService != null) { if (mService != null) {