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

Commit 5d9ccae4 authored by JW Wang's avatar JW Wang
Browse files

Fix a TODO in #onHealthCheckFailed (3/n) 

Now MonitoredPackage#mPackage is guaranteed to be non-null.

Bug: 141155222
Test: atest PackageWatchdogTest
Change-Id: I9b1f20ffd348031c37c2344ae61edbe232b18251
parent 5f6719f2

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

+2 −10
Original line number Diff line number Diff line
@@ -641,16 +641,8 @@ public class PackageWatchdog { 
                if (registeredObserver != null) {

                    Iterator<MonitoredPackage> it = failedPackages.iterator();

                    while (it.hasNext()) {

                        String failedPackage = it.next().getName();

                        Slog.i(TAG, "Explicit health check failed for package " + failedPackage);

                        VersionedPackage versionedPkg = getVersionedPackage(failedPackage);

                        if (versionedPkg == null) {

                            Slog.w(TAG, "Explicit health check failed but could not find package "

                                    + failedPackage);

                            // TODO(b/120598832): Skip. We only continue to pass tests for now since

                            // the tests don't install any packages

                            versionedPkg = new VersionedPackage(failedPackage, 0L);

                        }

                        VersionedPackage versionedPkg = it.next().mPackage;

                        Slog.i(TAG, "Explicit health check failed for package " + versionedPkg);

                        registeredObserver.execute(versionedPkg);

                    }

                }