diff options
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java index f95b0aebfd70..9d1df26514ee 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java @@ -18,7 +18,6 @@ package com.android.keyguard; import android.app.ActivityManager; import android.app.AlarmManager; -import android.content.ContentResolver; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; @@ -198,12 +197,18 @@ public class KeyguardStatusView extends GridLayout { } private String getOwnerInfo() { - ContentResolver res = getContext().getContentResolver(); String info = null; - final boolean ownerInfoEnabled = mLockPatternUtils.isOwnerInfoEnabled( - KeyguardUpdateMonitor.getCurrentUser()); - if (ownerInfoEnabled) { - info = mLockPatternUtils.getOwnerInfo(KeyguardUpdateMonitor.getCurrentUser()); + if (mLockPatternUtils.isDeviceOwnerInfoEnabled()) { + // Use the device owner information set by device policy client via + // device policy manager. + info = mLockPatternUtils.getDeviceOwnerInfo(); + } else { + // Use the current user owner information if enabled. + final boolean ownerInfoEnabled = mLockPatternUtils.isOwnerInfoEnabled( + KeyguardUpdateMonitor.getCurrentUser()); + if (ownerInfoEnabled) { + info = mLockPatternUtils.getOwnerInfo(KeyguardUpdateMonitor.getCurrentUser()); + } } return info; } |