Merge "Update setOrganizationColor javadoc" into rvc-dev am: a077a8a0cc am: 2829be16f1

Change-Id: Ic0d48bb75a1da25a9a15f1171957c726e25ce12f
This commit is contained in:
Alex Johnston
2020-04-28 09:06:33 +00:00
committed by Automerger Merge Worker

View File

@@ -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.