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

Merge "Deprecate organization color"

Browse Source
This commit is contained in:
Alex Johnston
2020-05-07 13:38:01 +00:00
committed by Android (Google) Code Review
parent d86f08797c 76f073c016
commit 451d4a697b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -6891,7 +6891,7 @@ package android.app.admin {
method public int getMaximumFailedPasswordsForWipe(@Nullable android.content.ComponentName);
method public long getMaximumTimeToLock(@Nullable android.content.ComponentName);
method @NonNull public java.util.List<java.lang.String> getMeteredDataDisabledPackages(@NonNull android.content.ComponentName);
method @ColorInt public int getOrganizationColor(@NonNull android.content.ComponentName);
method @Deprecated @ColorInt public int getOrganizationColor(@NonNull android.content.ComponentName);
method @Nullable public CharSequence getOrganizationName(@NonNull android.content.ComponentName);
method public java.util.List<android.telephony.data.ApnSetting> getOverrideApns(@NonNull android.content.ComponentName);
method @NonNull public android.app.admin.DevicePolicyManager getParentProfileInstance(@NonNull android.content.ComponentName);
@@ -7023,7 +7023,7 @@ package android.app.admin {
method public void setMaximumTimeToLock(@NonNull android.content.ComponentName, long);
method @NonNull public java.util.List<java.lang.String> setMeteredDataDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
method public void setNetworkLoggingEnabled(@Nullable android.content.ComponentName, boolean);
method public void setOrganizationColor(@NonNull android.content.ComponentName, int);
method @Deprecated public void setOrganizationColor(@NonNull android.content.ComponentName, int);
method public void setOrganizationName(@NonNull android.content.ComponentName, @Nullable CharSequence);
method public void setOverrideApnsEnabled(@NonNull android.content.ComponentName, boolean);
method @NonNull public String[] setPackagesSuspended(@NonNull android.content.ComponentName, @NonNull String[], boolean);

12
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -10258,7 +10258,10 @@ public class DevicePolicyManager {
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param color The 24bit (0xRRGGBB) representation of the color to be used.
* @throws SecurityException if {@code admin} is not a profile owner.
* @deprecated From {@link android.os.Build.VERSION_CODES#R}, the organization color is never
* used as the background color of the confirm credentials screen.
*/
@Deprecated
public void setOrganizationColor(@NonNull ComponentName admin, int color) {
throwIfParentInstance("setOrganizationColor");
try {
@@ -10280,7 +10283,10 @@ public class DevicePolicyManager {
* @RequiresPermission(allOf = {
* Manifest.permission.MANAGE_USERS,
* Manifest.permission.INTERACT_ACROSS_USERS_FULL})
* @deprecated From {@link android.os.Build.VERSION_CODES#R}, the organization color is never
* used as the background color of the confirm credentials screen.
*/
@Deprecated
public void setOrganizationColorForUser(@ColorInt int color, @UserIdInt int userId) {
try {
// always enforce alpha channel to have 100% opacity
@@ -10298,7 +10304,10 @@ public class DevicePolicyManager {
* @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @return The 24bit (0xRRGGBB) representation of the color to be used.
* @throws SecurityException if {@code admin} is not a profile owner.
* @deprecated From {@link android.os.Build.VERSION_CODES#R}, the organization color is never
* used as the background color of the confirm credentials screen.
*/
@Deprecated
public @ColorInt int getOrganizationColor(@NonNull ComponentName admin) {
throwIfParentInstance("getOrganizationColor");
try {
@@ -10314,7 +10323,10 @@ public class DevicePolicyManager {
*
* @param userHandle The user id of the user we're interested in.
* @return The 24bit (0xRRGGBB) representation of the color to be used.
* @deprecated From {@link android.os.Build.VERSION_CODES#R}, the organization color is never
* used as the background color of the confirm credentials screen.
*/
@Deprecated
public @ColorInt int getOrganizationColorForUser(int userHandle) {
try {
return mService.getOrganizationColorForUser(userHandle);