Merge changes from topic 'ClosebySystem' into oc-mr1-dev (560d5650) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -831,7 +831,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {

		// Commit was keeping session marked as active until now; release
		// that extra refcount so session appears idle.
		close();
		closeInternal(false);
		return;
		}

		@@ -1388,9 +1388,16 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {

		@Override
		public void close() {
		closeInternal(true);
		}

		private void closeInternal(boolean checkCaller) {
		int activeCount;
		synchronized (mLock) {
		if (checkCaller) {
		assertCallerIsOwnerOrRootLocked();
		}

		activeCount = mActiveCount.decrementAndGet();
		}