Merge "Mark boot completion via apexservice" am: c1cef10d58 (1ae3832f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/ApexManager.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,11 @@ public abstract class ApexManager {
		*/
		public abstract boolean destroyCeSnapshotsNotSpecified(int userId, int[] retainRollbackIds);

		/**
		* Inform apexd that the boot has completed.
		*/
		public abstract void markBootCompleted();

		/**
		* Dumps various state information to the provided {@link PrintWriter} object.
		*
		@@ -883,6 +888,15 @@ public abstract class ApexManager {
		}
		}

		@Override
		public void markBootCompleted() {
		try {
		waitForApexService().markBootCompleted();
		} catch (RemoteException re) {
		Slog.e(TAG, "Unable to contact apexservice", re);
		}
		}

		/**
		* Dump information about the packages contained in a particular cache
		* @param packagesCache the cache to print information about.
		@@ -1129,6 +1143,11 @@ public abstract class ApexManager {
		return true;
		}

		@Override
		public void markBootCompleted() {
		// No-op
		}

		@Override
		void dump(PrintWriter pw, String packageName) {
		// No-op

+5 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,7 @@ public class StagingManager {
		public void onBootPhase(int phase) {
		if (phase == SystemService.PHASE_BOOT_COMPLETED && sStagingManager != null) {
		sStagingManager.markStagedSessionsAsSuccessful();
		sStagingManager.markBootCompleted();
		}
		}
		}
		@@ -179,6 +180,10 @@ public class StagingManager {
		}
		}

		private void markBootCompleted() {
		mApexManager.markBootCompleted();
		}

		/**
		* Validates the signature used to sign the container of the new apex package
		*