This broadcast is sent to registered receivers only. * - *
The following extras will be included to identify the type of resource being updated: - *
{@link #EXTRA_RESOURCE_TYPE} will be included to identify the type of resource being + * updated. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_DEVICE_POLICY_RESOURCE_UPDATED = "android.app.action.DEVICE_POLICY_RESOURCE_UPDATED"; /** - * A boolean extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate that a - * resource of type {@link Drawable} is being updated. + * An {@code int} extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate the type + * of the resource being updated, the type can be {@link #EXTRA_RESOURCE_TYPE_DRAWABLE} or + * {@link #EXTRA_RESOURCE_TYPE_STRING} */ - public static final String EXTRA_RESOURCE_TYPE_DRAWABLE = - "android.app.extra.RESOURCE_TYPE_DRAWABLE"; + public static final String EXTRA_RESOURCE_TYPE = + "android.app.extra.RESOURCE_TYPE"; /** - * A boolean extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate that a - * resource of type {@link String} is being updated. + * A {@code int} value for {@link #EXTRA_RESOURCE_TYPE} to indicate that a resource of type + * {@link Drawable} is being updated. */ - public static final String EXTRA_RESOURCE_TYPE_STRING = - "android.app.extra.RESOURCE_TYPE_STRING"; + public static final int EXTRA_RESOURCE_TYPE_DRAWABLE = 1; + + /** + * A {@code int} value for {@link #EXTRA_RESOURCE_TYPE} to indicate that a resource of type + * {@link String} is being updated. + */ + public static final int EXTRA_RESOURCE_TYPE_STRING = 2; /** * An integer array extra for {@link #ACTION_DEVICE_POLICY_RESOURCE_UPDATED} to indicate which - * resource IDs (see {@link DevicePolicyResources.UpdatableDrawableId} and - * {@link DevicePolicyResources.UpdatableStringId}) have been updated. + * resource IDs (see {@link DevicePolicyResources.Drawables} and + * {@link DevicePolicyResources.Strings}) have been updated. */ - public static final String EXTRA_RESOURCE_ID = - "android.app.extra.RESOURCE_ID"; + public static final String EXTRA_RESOURCE_IDS = + "android.app.extra.RESOURCE_IDS"; /** @hide */ @NonNull diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java index 5af15300d10bb..4bc5850cd2933 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java @@ -26,6 +26,7 @@ import static android.app.ActivityOptions.ANIM_THUMBNAIL_SCALE_DOWN; import static android.app.ActivityOptions.ANIM_THUMBNAIL_SCALE_UP; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED; +import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE; import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_DRAWABLE; import static android.app.admin.DevicePolicyResources.Drawables.Source.PROFILE_SWITCH_ANIMATION; import static android.app.admin.DevicePolicyResources.Drawables.Style.OUTLINE; @@ -156,9 +157,8 @@ public class DefaultTransitionHandler implements Transitions.TransitionHandler { private BroadcastReceiver mEnterpriseResourceUpdatedReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - boolean isDrawable = intent.getBooleanExtra( - EXTRA_RESOURCE_TYPE_DRAWABLE, /* default= */ false); - if (!isDrawable) { + if (intent.getIntExtra(EXTRA_RESOURCE_TYPE, /* default= */ -1) + != EXTRA_RESOURCE_TYPE_DRAWABLE) { return; } updateEnterpriseThumbnailDrawable(); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 5aa3dfea3ea49..97ef490184d97 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -45,7 +45,8 @@ import static android.app.admin.DevicePolicyManager.DELEGATION_SECURITY_LOGGING; import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_DEFAULT; import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED; import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE_PER_USER; -import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_ID; +import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_IDS; +import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE; import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_DRAWABLE; import static android.app.admin.DevicePolicyManager.EXTRA_RESOURCE_TYPE_STRING; import static android.app.admin.DevicePolicyManager.ID_TYPE_BASE_INFO; @@ -18692,10 +18693,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { sendResourceUpdatedBroadcast(EXTRA_RESOURCE_TYPE_STRING, stringIds); } - private void sendResourceUpdatedBroadcast(String resourceType, String[] resourceIds) { + private void sendResourceUpdatedBroadcast(int resourceType, String[] resourceIds) { final Intent intent = new Intent(ACTION_DEVICE_POLICY_RESOURCE_UPDATED); - intent.putExtra(EXTRA_RESOURCE_ID, resourceIds); - intent.putExtra(resourceType, /* value= */ true); + intent.putExtra(EXTRA_RESOURCE_IDS, resourceIds); + intent.putExtra(EXTRA_RESOURCE_TYPE, resourceType); intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);