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

Commit 92ade0fb authored Dec 02, 2024 by Harshit Mahajan

Rename startObservingHealth API

To make it more clear for clients renaming PackageWatchdog
startObservingHealth API to startExplicitHealthCheck.

Bug: 361126781
Test: build passes
Flag: EXEMPT refactoring
Change-Id: I3ace10cedf1c54c861a9ed12e6667a5b1dcfd97b

parent 8700dfee

packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -392,7 +392,7 @@ public class PackageWatchdog {
		* @throws IllegalStateException if the observer was not previously registered
		* @hide
		*/
		public void startObservingHealth(@NonNull PackageHealthObserver observer,
		public void startExplicitHealthCheck(@NonNull PackageHealthObserver observer,
		@NonNull List<String> packageNames, long timeoutMs) {
		synchronized (sLock) {
		if (!mAllObservers.containsKey(observer.getUniqueIdentifier())) {
		@@ -918,7 +918,7 @@ public class PackageWatchdog {
		* passed to observers in these API.
		*
		* <p> A persistent observer may choose to start observing certain failing packages, even if
		* it has not explicitly asked to watch the package with {@link #startObservingHealth}.
		* it has not explicitly asked to watch the package with {@link #startExplicitHealthCheck}.
		*/
		default boolean mayObservePackage(@NonNull String packageName) {
		return false;

packages/CrashRecovery/services/module/java/com/android/server/RescueParty.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ public class RescueParty {
		callingPackageList.addAll(callingPackages);
		Slog.i(TAG, "Starting to observe: " + callingPackageList + ", updated namespace: "
		+ updatedNamespace);
		PackageWatchdog.getInstance(context).startObservingHealth(
		PackageWatchdog.getInstance(context).startExplicitHealthCheck(
		rescuePartyObserver,
		callingPackageList,
		DEFAULT_OBSERVING_DURATION_MS);

packages/CrashRecovery/services/module/java/com/android/server/rollback/RollbackPackageHealthObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve
		@AnyThread
		@NonNull
		public void startObservingHealth(@NonNull List<String> packages, @NonNull long durationMs) {
		PackageWatchdog.getInstance(mContext).startObservingHealth(this, packages, durationMs);
		PackageWatchdog.getInstance(mContext).startExplicitHealthCheck(this, packages, durationMs);
		}

		@AnyThread

packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -397,7 +397,7 @@ public class PackageWatchdog {
		* {@link #DEFAULT_OBSERVING_DURATION_MS} will be used.
		* @hide
		*/
		public void startObservingHealth(PackageHealthObserver observer, List<String> packageNames,
		public void startExplicitHealthCheck(PackageHealthObserver observer, List<String> packageNames,
		long durationMs) {
		if (packageNames.isEmpty()) {
		Slog.wtf(TAG, "No packages to observe, " + observer.getUniqueIdentifier());
		@@ -862,7 +862,7 @@ public class PackageWatchdog {
		* otherwise
		*
		* <p> A persistent observer may choose to start observing certain failing packages, even if
		* it has not explicitly asked to watch the package with {@link #startObservingHealth}.
		* it has not explicitly asked to watch the package with {@link #startExplicitHealthCheck}.
		*/
		default boolean mayObservePackage(@NonNull String packageName) {
		return false;

packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -387,7 +387,7 @@ public class RescueParty {
		callingPackageList.addAll(callingPackages);
		Slog.i(TAG, "Starting to observe: " + callingPackageList + ", updated namespace: "
		+ updatedNamespace);
		PackageWatchdog.getInstance(context).startObservingHealth(
		PackageWatchdog.getInstance(context).startExplicitHealthCheck(
		rescuePartyObserver,
		callingPackageList,
		DEFAULT_OBSERVING_DURATION_MS);