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

Commit efb3ff11 authored by Gavin Corkery's avatar Gavin Corkery
Browse files

Dump status of Package Watchdog observers 

Include pertinent information of Package Watchdog observers
(name, persistence, packages) in Rollback Manager dumpsys.

Test: adb shell dumpsys rollback
Bug: 134495491
Change-Id: I32c7401d0641535b0b8cc0ac9fcc7f8fbb40b3cd
parent 84e99020

services/core/java/com/android/server/PackageWatchdog.java

+32 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.XmlUtils;



import libcore.io.IoUtils;
@@ -817,6 +818,21 @@ public class PackageWatchdog { 
        }

    }



    /** Dump status of every observer in mAllObservers. */

    public void dump(IndentingPrintWriter pw) {

        pw.println("Package Watchdog status");

        pw.increaseIndent();

        synchronized (mLock) {

            for (String observerName : mAllObservers.keySet()) {

                pw.println("Observer name: " + observerName);

                pw.increaseIndent();

                ObserverInternal observerInternal = mAllObservers.get(observerName);

                observerInternal.dump(pw);

                pw.decreaseIndent();

            }

        }

    }



    /**

     * Represents an observer monitoring a set of packages along with the failure thresholds for

     * each package.
@@ -959,6 +975,22 @@ public class PackageWatchdog { 
            }

            return new ObserverInternal(observerName, packages);

        }



        /** Dumps information about this observer and the packages it watches. */

        public void dump(IndentingPrintWriter pw) {

            boolean isPersistent = registeredObserver != null && registeredObserver.isPersistent();

            pw.println("Persistent: " + isPersistent);

            for (String packageName : packages.keySet()) {

                MonitoredPackage p = packages.get(packageName);

                pw.println(packageName +  ": ");

                pw.increaseIndent();

                pw.println("# Failures: " + p.mFailureHistory.size());

                pw.println("Monitoring duration remaining: " + p.mDurationMs + "ms");

                pw.println("Explicit health check duration: " + p.mHealthCheckDurationMs + "ms");

                pw.println("Health check state: " + p.toString(p.mHealthCheckState));

                pw.decreaseIndent();

            }

        }

    }



    @Retention(SOURCE)

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.util.DumpUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.LocalServices;

import com.android.server.PackageWatchdog;

import com.android.server.Watchdog;

import com.android.server.pm.Installer;
@@ -1160,6 +1161,8 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
            for (Rollback rollback : mRollbacks) {

                rollback.dump(ipw);

            }

            ipw.println();

            PackageWatchdog.getInstance(mContext).dump(ipw);

        }

    }