From d0bed126614326c8c163abb7f31352d975ac0238 Mon Sep 17 00:00:00 2001 From: Paul Hu Date: Fri, 17 Jun 2022 13:11:59 +0000 Subject: [PATCH] Remove the package name from PermissionMonitor dump logs According to the Android CDD, the connectivity bug report can not include any kind of unser-installed package name. Thus, remove the package name from PermissionMonitor dump logs. Before: 2022-06-17T04:12:58.317509 - Package remove: name=com.android.\ frameworks.tests.net, uid=10092, nPerm=(NONE/NETWORK),\ tPerm=UNINSTALLED 2022-06-17T04:11:22.539777 - Package add: name=com.android.\ frameworks.tests.net, uid=10092, nPerm=(NETWORK/NONE),\ tPerm=INTERNET After: 2022-06-17T12:45:00.430175 - Package remove: uid=10092,\ nPerm=(NONE/NETWORK), tPerm=UNINSTALLED 2022-06-17T12:44:56.144445 - Package add: uid=10092,\ nPerm=(NETWORK/NONE), tPerm=INTERNET Bug: 235512126 Test: adb shell dumpsys connectivity to see the logs. Change-Id: I9eb496a1b27575e6b5e84d289280a8e49d212020 --- .../com/android/server/connectivity/PermissionMonitor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/com/android/server/connectivity/PermissionMonitor.java b/service/src/com/android/server/connectivity/PermissionMonitor.java index dedeb380ea..34c6d2d379 100755 --- a/service/src/com/android/server/connectivity/PermissionMonitor.java +++ b/service/src/com/android/server/connectivity/PermissionMonitor.java @@ -791,7 +791,7 @@ public class PermissionMonitor { mAllApps.add(appId); // Log package added. - mPermissionUpdateLogs.log("Package add: name=" + packageName + ", uid=" + uid + mPermissionUpdateLogs.log("Package add: uid=" + uid + ", nPerm=(" + permissionToString(permission) + "/" + permissionToString(currentPermission) + ")" + ", tPerm=" + permissionToString(appIdTrafficPerm)); @@ -844,7 +844,7 @@ public class PermissionMonitor { final int permission = highestUidNetworkPermission(uid); // Log package removed. - mPermissionUpdateLogs.log("Package remove: name=" + packageName + ", uid=" + uid + mPermissionUpdateLogs.log("Package remove: uid=" + uid + ", nPerm=(" + permissionToString(permission) + "/" + permissionToString(currentPermission) + ")" + ", tPerm=" + permissionToString(appIdTrafficPerm));