Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Parks
2023-04-27 17:40:48 +00:00
committed by Android (Google) Code Review
parent 1f4ed1eca3 c7269691b5
commit c4d4992a12
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -16374,7 +16374,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
// TODO(b/128928355): if this restriction is enforced by multiple DPCs, return // TODO(b/128928355): if this restriction is enforced by multiple DPCs, return
// the admin for the calling user. // the admin for the calling user.
Slogf.w(LOG_TAG, "getEnforcingAdminAndUserDetailsInternal(%d, %s): multiple " 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 = new Bundle();
result.putInt(Intent.EXTRA_USER_ID, userId); result.putInt(Intent.EXTRA_USER_ID, userId);
return result; return result;