Merge "Always restart apps if base.apk gets updated." into tm-dev (6d000540) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IPackageInstallerSession.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,4 +57,5 @@ interface IPackageInstallerSession {
		int getParentSessionId();

		boolean isStaged();
		int getInstallFlags();
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -1585,6 +1585,18 @@ public class PackageInstaller {
		}
		}

		/**
		* @return Session's {@link SessionParams#installFlags}.
		* @hide
		*/
		public int getInstallFlags() {
		try {
		return mSession.getInstallFlags();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* @return the session ID of the multi-package session that this belongs to or
		* {@link SessionInfo#INVALID_ID} if it does not belong to a multi-package session.

+8 −0

Original line number	Diff line number	Diff line
		@@ -2860,6 +2860,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		inheritFileLocked(mResolvedBaseFile);
		// Collect the requiredSplitTypes from base
		CollectionUtils.addAll(requiredSplitTypes, existing.getBaseRequiredSplitTypes());
		} else {
		// Installing base.apk. Make sure the app is restarted.
		params.setDontKillApp(false);
		}

		// Inherit splits if not overridden.
		@@ -3555,6 +3558,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		return params.isStaged;
		}

		@Override
		public int getInstallFlags() {
		return params.installFlags;
		}

		@Override
		public DataLoaderParamsParcel getDataLoaderParams() {
		mContext.enforceCallingOrSelfPermission(Manifest.permission.USE_INSTALLER_V2, null);