Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10d79f96 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Move the lock to the individual app restriction setting's dump" into tm-dev am: de24bcd6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17034872

Change-Id: I736284f5a829bbe889e94d6236e51179e795ede1
parents 3226cebb de24bcd6

services/core/java/com/android/server/am/AppRestrictionController.java

+22 −24
Original line number Diff line number Diff line
@@ -398,8 +398,8 @@ public final class AppRestrictionController { 
                return sb.toString();

            }



            @GuardedBy("mSettingsLock")

            void dump(PrintWriter pw, @ElapsedRealtimeLong long nowElapsed) {

                synchronized (mSettingsLock) {

                    pw.print(toString());

                    if (mLastRestrictionLevel != RESTRICTION_LEVEL_UNKNOWN) {

                        pw.print('/');
@@ -418,6 +418,7 @@ public final class AppRestrictionController { 
                            }

                        }

                    }

                }

                pw.print(" effectiveExemption=");

                pw.print(reasonCodeToString(getBackgroundRestrictionExemptionReason(mUid)));

            }
@@ -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<>();

            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();