Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a588de2 authored by Jason Parks's avatar Jason Parks Committed by Automerger Merge Worker
Browse files

Merge "Add missing log parameters and fix the ordering." into udc-dev am: c4d4992a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22889663



Change-Id: I355b3fc78fbd01ac1e4e313c1aba6e96dbead466
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8521e0a0 c4d4992a

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

+2 −1
Original line number Diff line number Diff line
@@ -16374,7 +16374,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    // TODO(b/128928355): if this restriction is enforced by multiple DPCs, return

                    // the admin for the calling user.

                    Slogf.w(LOG_TAG, "getEnforcingAdminAndUserDetailsInternal(%d, %s): multiple "

                            + "sources for restriction %s on user %d", restriction, userId);

                            + "sources for restriction %s on user %d",

                            userId, restriction, restriction, userId);

                    result = new Bundle();

                    result.putInt(Intent.EXTRA_USER_ID, userId);

                    return result;