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

Move the lock to the individual app restriction setting's dump

Browse Source 
The exemption check shouldn't be called with the lock held.

Bug: 220930052
Test: atest PackageManagerShellCommandTest
Test: atest FrameworksMockingServicesTests:BackgroundRestrictionTest
Change-Id: I7d45edd502acd94c7c8ef50b1c9423fc736951a3
This commit is contained in:
Jing Ji
2022-02-28 10:34:50 -08:00
parent deb79e3070
commit 44c9d303e2
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
services/core/java/com/android/server/am/AppRestrictionController.java
View File

@@ -398,23 +398,24 @@ public final class AppRestrictionController {
return sb.toString();
}
@GuardedBy("mSettingsLock")
void dump(PrintWriter pw, @ElapsedRealtimeLong long nowElapsed) {
pw.print(toString());
if (mLastRestrictionLevel != RESTRICTION_LEVEL_UNKNOWN) {
pw.print('/');
pw.print(ActivityManager.restrictionLevelToName(mLastRestrictionLevel));
}
pw.print(" levelChange=");
TimeUtils.formatDuration(mLevelChangeTimeElapsed - nowElapsed, pw);
if (mLastNotificationShownTimeElapsed != null) {
for (int i = 0; i < mLastNotificationShownTimeElapsed.length; i++) {
if (mLastNotificationShownTimeElapsed[i] > 0) {
pw.print(" lastNoti(");
pw.print(mNotificationHelper.notificationTypeToString(i));
pw.print(")=");
TimeUtils.formatDuration(
mLastNotificationShownTimeElapsed[i] - nowElapsed, pw);
synchronized (mSettingsLock) {
pw.print(toString());
if (mLastRestrictionLevel != RESTRICTION_LEVEL_UNKNOWN) {
pw.print('/');
pw.print(ActivityManager.restrictionLevelToName(mLastRestrictionLevel));
}
pw.print(" levelChange=");
TimeUtils.formatDuration(mLevelChangeTimeElapsed - nowElapsed, pw);
if (mLastNotificationShownTimeElapsed != null) {
for (int i = 0; i < mLastNotificationShownTimeElapsed.length; i++) {
if (mLastNotificationShownTimeElapsed[i] > 0) {
pw.print(" lastNoti(");
pw.print(mNotificationHelper.notificationTypeToString(i));
pw.print(")=");
TimeUtils.formatDuration(
mLastNotificationShownTimeElapsed[i] - nowElapsed, pw);
}
}
}
}
@@ -612,10 +613,11 @@ public final class AppRestrictionController {
}
}
@GuardedBy("mSettingsLock")
void dumpLocked(PrintWriter pw, String prefix) {
void dump(PrintWriter pw, String prefix) {
final ArrayList<PkgSettings> settings = new ArrayList<>();
mRestrictionLevels.forEach(setting -> settings.add(setting));
synchronized (mSettingsLock) {
mRestrictionLevels.forEach(setting -> settings.add(setting));
}
Collections.sort(settings, Comparator.comparingInt(PkgSettings::getUid));
final long nowElapsed = SystemClock.elapsedRealtime();
for (int i = 0, size = settings.size(); i < size; i++) {
@@ -1322,11 +1324,7 @@ public final class AppRestrictionController {
prefix = " " + prefix;
pw.print(prefix);
pw.println("BACKGROUND RESTRICTION LEVEL SETTINGS");
/*
synchronized (mSettingsLock) {
mRestrictionSettings.dumpLocked(pw, " " + prefix);
}
*/
mRestrictionSettings.dump(pw, " " + prefix);
mConstantsObserver.dump(pw, " " + prefix);
for (int i = 0, size = mAppStateTrackers.size(); i < size; i++) {
pw.println();