From 058cd67a1d5f2b89bdc069e0e8b17d15fbf008c9 Mon Sep 17 00:00:00 2001 From: Eghosa Ewansiha-Vlachavas Date: Thu, 18 Aug 2022 11:40:22 +0000 Subject: [PATCH] Add delegation info to dumpsys device_policy Show delegation package to delegation scopes map when running "adb shell dumpsys device_policy" to aid with debugging. Bug: 196340658 Test: manual - ran "adb shell dumpsys device_policy" Change-Id: I4c86971404fe80d1a9452cfb829e2adb80c88955 --- .../server/devicepolicy/DevicePolicyData.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java index 054181dfa7285..0305c35b1828b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyData.java @@ -671,6 +671,21 @@ class DevicePolicyData { if (mFactoryResetReason != null) { pw.print("mFactoryResetReason="); pw.println(mFactoryResetReason); } + if (mDelegationMap.size() != 0) { + pw.println("mDelegationMap="); + pw.increaseIndent(); + for (int i = 0; i < mDelegationMap.size(); i++) { + List delegationScopes = mDelegationMap.valueAt(i); + pw.println(mDelegationMap.keyAt(i) + "[size=" + delegationScopes.size() + + "]"); + pw.increaseIndent(); + for (int j = 0; j < delegationScopes.size(); j++) { + pw.println(j + ": " + delegationScopes.get(j)); + } + pw.decreaseIndent(); + } + pw.decreaseIndent(); + } pw.decreaseIndent(); }