Merge "Add parent check on DevicePolicyManager.isSafeOperation()" into sc-dev

2021-03-04 17:20:20 +00:00
parent 1b8c938a89 f377c28fc5
commit d42e4a6771
1 changed files with 1 additions and 0 deletions
--- 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 {