Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class" (d705e2c8) · Commits · e / os / android_frameworks_base

core/java/android/accounts/CantAddAccountActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public class CantAddAccountActivity extends Activity {
		setContentView(R.layout.app_not_authorized);

		TextView view = findViewById(R.id.description);
		String text = getSystemService(DevicePolicyManager.class).getString(
		String text = getSystemService(DevicePolicyManager.class).getResources().getString(
		CANT_ADD_ACCOUNT_MESSAGE,
		() -> getString(R.string.error_message_change_not_allowed));
		view.setText(text);

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public class ChooseTypeAndAccountActivity extends Activity

		setContentView(R.layout.app_not_authorized);
		TextView view = findViewById(R.id.description);
		String text = getSystemService(DevicePolicyManager.class).getString(
		String text = getSystemService(DevicePolicyManager.class).getResources().getString(
		CANT_ADD_ACCOUNT_MESSAGE,
		() -> getString(R.string.error_message_change_not_allowed));
		view.setText(text);

core/java/android/app/ApplicationPackageManager.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@ package android.app;

		import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_COLORED;
		import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_NOT_COLORED;
		import static android.app.admin.DevicePolicyResources.Drawables.UNDEFINED;
		import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON;
		import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON_BADGE;
		import static android.app.admin.DevicePolicyResources.UNDEFINED;
		import static android.content.pm.Checksum.TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256;
		import static android.content.pm.Checksum.TYPE_PARTIAL_MERKLE_ROOT_1M_SHA512;
		import static android.content.pm.Checksum.TYPE_WHOLE_MD5;
		@@ -1886,7 +1886,7 @@ public class ApplicationPackageManager extends PackageManager {
		return icon;
		}

		final Drawable badgeForeground = getDevicePolicyManager().getDrawable(
		final Drawable badgeForeground = getDevicePolicyManager().getResources().getDrawable(
		getUpdatableUserIconBadgeId(user),
		SOLID_COLORED,
		() -> getDefaultUserIconBadge(user));
		@@ -1938,7 +1938,8 @@ public class ApplicationPackageManager extends PackageManager {
		return null;
		}

		final Drawable badgeForeground = getDevicePolicyManager().getDrawableForDensity(
		final Drawable badgeForeground = getDevicePolicyManager().getResources()
		.getDrawableForDensity(
		getUpdatableUserBadgeId(user),
		SOLID_COLORED,
		density,
		@@ -1968,7 +1969,7 @@ public class ApplicationPackageManager extends PackageManager {
		return null;
		}

		final Drawable badge = getDevicePolicyManager().getDrawableForDensity(
		final Drawable badge = getDevicePolicyManager().getResources().getDrawableForDensity(
		getUpdatableUserBadgeId(user),
		SOLID_NOT_COLORED,
		density,

core/java/android/app/Notification.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,8 @@ package android.app;
		import static android.annotation.Dimension.DP;
		import static android.app.admin.DevicePolicyResources.Drawables.Source.NOTIFICATION;
		import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_COLORED;
		import static android.app.admin.DevicePolicyResources.Drawables.UNDEFINED;
		import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON;
		import static android.app.admin.DevicePolicyResources.UNDEFINED;
		import static android.graphics.drawable.Icon.TYPE_URI;
		import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP;

		@@ -5079,7 +5079,7 @@ public class Notification implements Parcelable
		// Note: This assumes that the current user can read the profile badge of the
		// originating user.
		DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
		return dpm.getDrawable(
		return dpm.getResources().getDrawable(
		getUpdatableProfileBadgeId(), SOLID_COLORED, NOTIFICATION,
		this::getDefaultProfileBadgeDrawable);
		}

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import android.annotation.WorkerThread;
		import android.app.Activity;
		import android.app.IServiceConnection;
		import android.app.KeyguardManager;
		import android.app.admin.DevicePolicyResources.Drawables;
		import android.app.admin.SecurityLog.SecurityEvent;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		@@ -56,10 +55,8 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.UserInfo;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.Icon;
		import android.net.PrivateDnsConnectivityChecker;
		import android.net.ProxyInfo;
		import android.net.Uri;
		@@ -97,7 +94,6 @@ import android.telephony.data.ApnSetting;
		import android.text.TextUtils;
		import android.util.ArraySet;
		import android.util.DebugUtils;
		import android.util.DisplayMetrics;
		import android.util.Log;
		import android.util.Pair;

		@@ -137,7 +133,6 @@ import java.util.concurrent.CompletableFuture;
		import java.util.concurrent.ExecutionException;
		import java.util.concurrent.Executor;
		import java.util.function.Consumer;
		import java.util.function.Supplier;

		// TODO(b/172376923) - add CarDevicePolicyManager examples below (or remove reference to it).
		/**