Merge \"Remove subtle dependencies\" into nyc-mr1-dev (7de21af6) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -182,6 +182,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		*/
		private final Random mRandom = new SecureRandom();

		/** All sessions allocated */
		@GuardedBy("mSessions")
		private final SparseBooleanArray mAllocatedSessions = new SparseBooleanArray();

		@GuardedBy("mSessions")
		private final SparseArray<PackageInstallerSession> mSessions = new SparseArray<>();

		@@ -365,6 +369,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		// keep details around for dumpsys.
		mHistoricalSessions.put(session.sessionId, session);
		}
		mAllocatedSessions.put(session.sessionId, true);
		}
		}
		}
		@@ -768,8 +773,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
		int sessionId;
		do {
		sessionId = mRandom.nextInt(Integer.MAX_VALUE - 1) + 1;
		if (mSessions.get(sessionId) == null && mHistoricalSessions.get(sessionId) == null
		&& !mLegacySessions.get(sessionId, false)) {
		if (!mAllocatedSessions.get(sessionId, false)) {
		mAllocatedSessions.put(sessionId, true);
		return sessionId;
		}
		} while (n++ < 32);