commit 6fdf74012d23e95c8f6c5ddb023f6ab64f2c230c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 30 03:52:17 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 30 03:52:17 2024 +0000
tree e995db89441590ea89ef36ab0832e9d15f828aa8
parent 85ae83ecd587e0f48a90453ce72e8ee37a3ddc4f
parent 2768a0410a3431692d4b96884d3b316064a478c0

Merge "Return copy of mEnforcingAdmin from getEnforcingAdminsOnUser" into main

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
index e763c9e..669a999 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
@@ -1588,7 +1588,7 @@
     private Set<EnforcingAdmin> getEnforcingAdminsOnUser(int userId) {
         synchronized (mLock) {
             return mEnforcingAdmins.contains(userId)
-                    ? mEnforcingAdmins.get(userId) : Collections.emptySet();
+                    ? new HashSet<>(mEnforcingAdmins.get(userId)) : Collections.emptySet();
         }
     }