| commit | b3958d766bb7748fd034be8ddf7b2e4fab42742b | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Thu Dec 03 16:12:54 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 03 16:12:54 2015 +0000 |
| tree | 35067c40416325508acdfb219f74b1c3de16c7ad | |
| parent | 2a5d79aa6fd882ef6f46439f5156c516f173f06a [diff] | |
| parent | 968dea0969c6aec651b91845e8d63462c5f20609 [diff] |
Merge "DPMS: Replace ArrayList<>(1) with SingletonList"
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index dbfd80d..99cd9ab 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -4493,8 +4493,7 @@ if (user.isManagedProfile()) { // If we are being asked about a managed profile just return // keyguard features disabled by admins in the profile. - profiles = new ArrayList<UserInfo>(1); - profiles.add(user); + profiles = Collections.singletonList(user); } else { // Otherwise return those set by admins in the user // and its profiles.