Merge "Make observer last parameter" into main (964438f3) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -347,8 +347,8 @@ public class PackageWatchdog {
		* and boot loops.
		* @param executor Executor for the thread on which observers would receive callbacks
		*/
		public void registerHealthObserver(@NonNull PackageHealthObserver observer,
		@NonNull @CallbackExecutor Executor executor) {
		public void registerHealthObserver(@NonNull @CallbackExecutor Executor executor,
		@NonNull PackageHealthObserver observer) {
		synchronized (sLock) {
		ObserverInternal internalObserver = mAllObservers.get(observer.getUniqueIdentifier());
		if (internalObserver != null) {
		@@ -390,8 +390,8 @@ public class PackageWatchdog {
		*
		* @throws IllegalStateException if the observer was not previously registered
		*/
		public void startExplicitHealthCheck(@NonNull PackageHealthObserver observer,
		@NonNull List<String> packageNames, long timeoutMs) {
		public void startExplicitHealthCheck(@NonNull List<String> packageNames, long timeoutMs,
		@NonNull PackageHealthObserver observer) {
		synchronized (sLock) {
		if (!mAllObservers.containsKey(observer.getUniqueIdentifier())) {
		Slog.wtf(TAG, "No observer found, need to register the observer: "

+3 −3

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ public class RescueParty {
		/** Register the Rescue Party observer as a Package Watchdog health observer */
		public static void registerHealthObserver(Context context) {
		PackageWatchdog.getInstance(context).registerHealthObserver(
		RescuePartyObserver.getInstance(context), context.getMainExecutor());
		context.getMainExecutor(), RescuePartyObserver.getInstance(context));
		}

		private static boolean isDisabled() {
		@@ -316,9 +316,9 @@ public class RescueParty {
		Slog.i(TAG, "Starting to observe: " + callingPackageList + ", updated namespace: "
		+ updatedNamespace);
		PackageWatchdog.getInstance(context).startExplicitHealthCheck(
		rescuePartyObserver,
		callingPackageList,
		DEFAULT_OBSERVING_DURATION_MS);
		DEFAULT_OBSERVING_DURATION_MS,
		rescuePartyObserver);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,8 +113,8 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve
		dataDir.mkdirs();
		mLastStagedRollbackIdsFile = new File(dataDir, "last-staged-rollback-ids");
		mTwoPhaseRollbackEnabledFile = new File(dataDir, "two-phase-rollback-enabled");
		PackageWatchdog.getInstance(mContext).registerHealthObserver(this,
		context.getMainExecutor());
		PackageWatchdog.getInstance(mContext).registerHealthObserver(context.getMainExecutor(),
		this);

		if (SystemProperties.getBoolean("sys.boot_completed", false)) {
		// Load the value from the file if system server has crashed and restarted

+4 −4

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ public class PackageWatchdog {
		* it will resume observing any packages requested from a previous boot.
		* @hide
		*/
		public void registerHealthObserver(PackageHealthObserver observer, Executor ignoredExecutor) {
		public void registerHealthObserver(Executor ignoredExecutor, PackageHealthObserver observer) {
		synchronized (mLock) {
		ObserverInternal internalObserver = mAllObservers.get(observer.getUniqueIdentifier());
		if (internalObserver != null) {
		@@ -397,8 +397,8 @@ public class PackageWatchdog {
		* {@link #DEFAULT_OBSERVING_DURATION_MS} will be used.
		* @hide
		*/
		public void startExplicitHealthCheck(PackageHealthObserver observer, List<String> packageNames,
		long durationMs) {
		public void startExplicitHealthCheck(List<String> packageNames, long durationMs,
		PackageHealthObserver observer) {
		if (packageNames.isEmpty()) {
		Slog.wtf(TAG, "No packages to observe, " + observer.getUniqueIdentifier());
		return;
		@@ -446,7 +446,7 @@ public class PackageWatchdog {
		}

		// Register observer in case not already registered
		registerHealthObserver(observer, null);
		registerHealthObserver(null, observer);

		// Sync after we add the new packages to the observers. We may have received packges
		// requiring an earlier schedule than we are currently scheduled for.

+3 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ public class RescueParty {
		/** Register the Rescue Party observer as a Package Watchdog health observer */
		public static void registerHealthObserver(Context context) {
		PackageWatchdog.getInstance(context).registerHealthObserver(
		RescuePartyObserver.getInstance(context), null);
		null, RescuePartyObserver.getInstance(context));
		}

		private static boolean isDisabled() {
		@@ -390,9 +390,9 @@ public class RescueParty {
		Slog.i(TAG, "Starting to observe: " + callingPackageList + ", updated namespace: "
		+ updatedNamespace);
		PackageWatchdog.getInstance(context).startExplicitHealthCheck(
		rescuePartyObserver,
		callingPackageList,
		DEFAULT_OBSERVING_DURATION_MS);
		DEFAULT_OBSERVING_DURATION_MS,
		rescuePartyObserver);
		}
		}