From 439947aec7b13cd24064288ee21b1bf68b848650 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Wed, 29 Apr 2020 15:14:20 +0100
Subject: [PATCH] Update work challenge header in Settings

* If organization name has been set for
  a managed profile, work challenge
  should display it as the header.

Bug: 155274026
Test: manual testing

Manual Testing Steps
* Set up device with managed profile
* Set organization name via TestDPC
* Go Settings > Security > Work profile security
  and add a work profile lock
* Select 'Work profile lock' and verify
  organization name is shown in header

Change-Id: I83209383fd2cf9179c34ccfdf8c097c379ec933e
---
 src/com/android/settings/password/ConfirmLockPassword.java | 3 +++
 src/com/android/settings/password/ConfirmLockPattern.java  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index 260919dbcee..7e774e6b918 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -159,6 +159,9 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                         ConfirmDeviceCredentialBaseFragment.HEADER_TEXT);
                 CharSequence detailsMessage = intent.getCharSequenceExtra(
                         ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
+                if (TextUtils.isEmpty(headerMessage) && mIsManagedProfile) {
+                    headerMessage = mDevicePolicyManager.getOrganizationNameForUser(mUserId);
+                }
                 if (TextUtils.isEmpty(headerMessage)) {
                     headerMessage = getString(getDefaultHeader());
                 }
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 06f3d93d3c8..48014cba3c8 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -26,6 +26,7 @@ import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.UserManager;
 import android.os.storage.StorageManager;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -136,6 +137,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                 mDetailsText = intent.getCharSequenceExtra(
                         ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT);
             }
+            if (TextUtils.isEmpty(mHeaderText) && mIsManagedProfile) {
+                mHeaderText = mDevicePolicyManager.getOrganizationNameForUser(mUserId);
+            }
 
             mLockPatternView.setTactileFeedbackEnabled(
                     mLockPatternUtils.isTactileFeedbackEnabled());