Merge "Do not set referrerUri on SessionInfo for non-owners" into rvc-dev am: 987b12ddcf (f9f22897) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageInstaller.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -2323,6 +2323,7 @@ public class PackageInstaller {

		/**
		* Get the value set in {@link SessionParams#setOriginatingUri(Uri)}.
		* Note: This value will only be non-null for the owner of the session.
		*/
		public @Nullable Uri getOriginatingUri() {
		return originatingUri;
		@@ -2337,6 +2338,7 @@ public class PackageInstaller {

		/**
		* Get the value set in {@link SessionParams#setReferrerUri(Uri)}
		* Note: This value will only be non-null for the owner of the session.
		*/
		public @Nullable Uri getReferrerUri() {
		return referrerUri;

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -805,26 +805,30 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		public SessionInfo getSessionInfo(int sessionId) {
		synchronized (mSessions) {
		final PackageInstallerSession session = mSessions.get(sessionId);
		return session != null ? session.generateInfo() : null;

		return session != null
		? session.generateInfoForCaller(true /withIcon/, Binder.getCallingUid())
		: null;
		}
		}

		@Override
		public ParceledListSlice<SessionInfo> getStagedSessions() {
		return mStagingManager.getSessions();
		return mStagingManager.getSessions(Binder.getCallingUid());
		}

		@Override
		public ParceledListSlice<SessionInfo> getAllSessions(int userId) {
		final int callingUid = Binder.getCallingUid();
		mPermissionManager.enforceCrossUserPermission(
		Binder.getCallingUid(), userId, true, false, "getAllSessions");
		callingUid, userId, true, false, "getAllSessions");

		final List<SessionInfo> result = new ArrayList<>();
		synchronized (mSessions) {
		for (int i = 0; i < mSessions.size(); i++) {
		final PackageInstallerSession session = mSessions.valueAt(i);
		if (session.userId == userId && !session.hasParentSessionId()) {
		result.add(session.generateInfo(false));
		result.add(session.generateInfoForCaller(false, callingUid));
		}
		}
		}
		@@ -842,7 +846,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		for (int i = 0; i < mSessions.size(); i++) {
		final PackageInstallerSession session = mSessions.valueAt(i);

		SessionInfo info = session.generateInfo(false);
		SessionInfo info =
		session.generateInfoForCaller(false /withIcon/, Process.SYSTEM_UID);
		if (Objects.equals(info.getInstallerPackageName(), installerPackageName)
		&& session.userId == userId && !session.hasParentSessionId()) {
		result.add(info);
		@@ -1302,7 +1307,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		session.markUpdated();
		writeSessionsAsync();
		if (mOkToSendBroadcasts) {
		mPm.sendSessionUpdatedBroadcast(session.generateInfo(false),
		// we don't scrub the data here as this is sent only to the installer several
		// privileged system packages
		mPm.sendSessionUpdatedBroadcast(
		session.generateInfoForCaller(false/icon/, Process.SYSTEM_UID),
		session.userId);
		}
		}

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

+40 −6

Original line number	Diff line number	Diff line
		@@ -557,11 +557,41 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}
		}

		public SessionInfo generateInfo() {
		return generateInfo(true);
		/**
		* Returns {@code true} if the {@link SessionInfo} object should be produced with potentially
		* sensitive data scrubbed from its fields.
		*
		* @param callingUid the uid of the caller; the recipient of the {@link SessionInfo} that may
		* need to be scrubbed
		*/
		private boolean shouldScrubData(int callingUid) {
		return !(callingUid < Process.FIRST_APPLICATION_UID \|\| getInstallerUid() == callingUid);
		}

		/**
		* Generates a {@link SessionInfo} object for the provided uid. This may result in some fields
		* that may contain sensitive info being filtered.
		*
		* @param includeIcon true if the icon should be included in the object
		* @param callingUid the uid of the caller; the recipient of the {@link SessionInfo} that may
		* need to be scrubbed
		* @see #shouldScrubData(int)
		*/
		public SessionInfo generateInfoForCaller(boolean includeIcon, int callingUid) {
		return generateInfoInternal(includeIcon, shouldScrubData(callingUid));
		}

		public SessionInfo generateInfo(boolean includeIcon) {
		/**
		* Generates a {@link SessionInfo} object to ensure proper hiding of sensitive fields.
		*
		* @param includeIcon true if the icon should be included in the object
		* @see #generateInfoForCaller(boolean, int)
		*/
		public SessionInfo generateInfoScrubbed(boolean includeIcon) {
		return generateInfoInternal(includeIcon, true /scrubData/);
		}

		private SessionInfo generateInfoInternal(boolean includeIcon, boolean scrubData) {
		final SessionInfo info = new SessionInfo();
		synchronized (mLock) {
		info.sessionId = sessionId;
		@@ -584,9 +614,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		info.appLabel = params.appLabel;

		info.installLocation = params.installLocation;
		if (!scrubData) {
		info.originatingUri = params.originatingUri;
		}
		info.originatingUid = params.originatingUid;
		if (!scrubData) {
		info.referrerUri = params.referrerUri;
		}
		info.grantedRuntimePermissions = params.grantedRuntimePermissions;
		info.whitelistedRestrictedPermissions = params.whitelistedRestrictedPermissions;
		info.installFlags = params.installFlags;
		@@ -2664,7 +2698,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		final boolean isNewInstall = extras == null \|\| !extras.getBoolean(Intent.EXTRA_REPLACING);
		if (success && isNewInstall && mPm.mInstallerService.okToSendBroadcasts()
		&& (params.installFlags & PackageManager.INSTALL_DRY_RUN) == 0) {
		mPm.sendSessionCommitBroadcast(generateInfo(), userId);
		mPm.sendSessionCommitBroadcast(generateInfoScrubbed(true /icon/), userId);
		}

		mCallback.onSessionFinished(this, success);

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -128,11 +128,12 @@ public class StagingManager {
		}
		}

		ParceledListSlice<PackageInstaller.SessionInfo> getSessions() {
		ParceledListSlice<PackageInstaller.SessionInfo> getSessions(int callingUid) {
		final List<PackageInstaller.SessionInfo> result = new ArrayList<>();
		synchronized (mStagedSessions) {
		for (int i = 0; i < mStagedSessions.size(); i++) {
		result.add(mStagedSessions.valueAt(i).generateInfo(false));
		final PackageInstallerSession stagedSession = mStagedSessions.valueAt(i);
		result.add(stagedSession.generateInfoForCaller(false /icon/, callingUid));
		}
		}
		return new ParceledListSlice<>(result);