From 6be8cda18095b19e951fd7e632456c92e2f1767c Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Mon, 27 Apr 2020 15:07:35 +0100
Subject: [PATCH] Update setOrganizationColor javadoc

Background
* In Android R, the UI of the work challenge was
  updated to latest material spec which no longer
  uses the organization color.

Changes
* Update javadoc of setOrganizationColor mentioning
  the organization color will no longer affect the
  work challenge starting from R.

Bug: 153607870
Bug: 153607569
Test: verify no build breakages
Change-Id: I071f544e4fba1915d810fa741dbc79966f9e72f4
---
 core/java/android/app/admin/DevicePolicyManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 41e2dc0de4d65..c507c8af0c9e4 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -10251,6 +10251,9 @@ public class DevicePolicyManager {
      * <p>
      * The confirm credentials screen can be created using
      * {@link android.app.KeyguardManager#createConfirmDeviceCredentialIntent}.
+     * <p>
+     * Starting from Android R, the organization color will no longer be used as the background
+     * color of the confirm credentials screen.
      *
      * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
      * @param color The 24bit (0xRRGGBB) representation of the color to be used.