diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-12-18 21:26:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-18 21:26:32 +0000 |
| commit | c5f607cee93ebf0ba072f80fc0e9c4cfa14ec318 (patch) | |
| tree | 5769f9b748e4bbfa9e04ceb906f489abdd6ff424 /core/java | |
| parent | 6088f10b8968a26ab4302d812cded7f041e91285 (diff) | |
| parent | 3b27ed07fecf9554efcbfde16502884b12a28cbb (diff) | |
Merge "Make isUsingUnifiedPassword throw when used on parent instance"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 89df421efcc1..4bb4c50190b0 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2676,6 +2676,7 @@ public class DevicePolicyManager { * @see UserManager#DISALLOW_UNIFIED_PASSWORD */ public boolean isUsingUnifiedPassword(@NonNull ComponentName admin) { + throwIfParentInstance("isUsingUnifiedPassword"); if (mService != null) { try { return mService.isUsingUnifiedPassword(admin); |