diff options
| author | Felipe Leme <felipeal@google.com> | 2021-03-04 17:20:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-04 17:20:20 +0000 |
| commit | d42e4a6771bef3a8194fe17fb12ce0135e59124a (patch) | |
| tree | ca4718fd971d70c5fb63f14776ee3effb03b0845 /core/java/android | |
| parent | 1b8c938a8995f5f530f56535617c25f6117ed706 (diff) | |
| parent | f377c28fc590509b96561fd626feb678b66f126c (diff) | |
Merge "Add parent check on DevicePolicyManager.isSafeOperation()" into sc-dev
Diffstat (limited to 'core/java/android')
| -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 b919bfc92e79..0635bd08e22b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2997,6 +2997,7 @@ public class DevicePolicyManager { */ // TODO(b/173541467): should it throw SecurityException if caller is not admin? public boolean isSafeOperation(@OperationSafetyReason int reason) { + throwIfParentInstance("isSafeOperation"); if (mService == null) return false; try { |