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

Merge "(b/278924166): log stack trace for debugging"

Browse Source
This commit is contained in:
Jonathan Scott
2023-05-03 12:37:47 +00:00
committed by Android (Google) Code Review
parent 354bd36b15 14267b16c7
commit 86c03e1e75
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3195,6 +3195,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final ActiveAdmin admin = getActiveAdminUncheckedLocked(adminReceiver, userHandle);
DevicePolicyData policy = getUserData(userHandle);
if (admin != null && !policy.mRemovingAdmins.contains(adminReceiver)) {
Slogf.d(LOG_TAG, "Adding " + adminReceiver + " for user " + userHandle
+ " to list of removing admins.");
logStackTrace("removeActiveAdminLocked");
policy.mRemovingAdmins.add(adminReceiver);
sendAdminCommandLocked(admin,
DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED,
@@ -18391,7 +18395,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
pushActiveAdminPackagesLocked(userHandle);
saveSettingsLocked(userHandle);
updateMaximumTimeToLockLocked(userHandle);
Slogf.d(LOG_TAG,
"Removing device admin " + adminReceiver + " from user " + userHandle);
logStackTrace("removeAdminArtifacts");
policy.mRemovingAdmins.remove(adminReceiver);
Slogf.d(LOG_TAG, "Current state of DevicePolicyData#mRemovingAdmins for user "
+ userHandle + ": " + policy.mRemovingAdmins);
pushScreenCapturePolicy(userHandle);
Slogf.i(LOG_TAG, "Device admin " + adminReceiver + " removed from user " + userHandle);
@@ -24315,4 +24327,28 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return getRoleHolderPackageNameOnUser(
RoleManager.ROLE_FINANCED_DEVICE_KIOSK, UserHandle.USER_ALL);
}
/**
* TODO (b/278924166): this method is added for debugging the specified bug.
* Remove once fixed.
**/
private void logStackTrace(String methodName) {
try {
StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
String stackMethod;
StringBuilder stackTrace = new StringBuilder();
for (StackTraceElement s : stackTraceElements) {
stackMethod = s.getMethodName();
if (stackMethod == null || stackMethod.equals("getThreadStackTrace")
|| stackMethod.equals("getStackTrace")
|| stackMethod.equals("logStackTrace")) {
continue;
}
stackTrace.append(s.getMethodName() + ":" + s.getLineNumber() + "\n");
}
Slogf.d(LOG_TAG, "StackTrace for " + methodName + ": \n" + stackTrace);
} catch (Exception e) {
Slogf.d(LOG_TAG, "Unable to get stacktrace");
}
}
}