Merge "Fix for Binder one-way deadlock." into rvc-dev (24c1e397) · Commits · e / os / android_frameworks_base

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

+23 −12

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		private static final int MSG_STREAM_VALIDATE_AND_COMMIT = 1;
		private static final int MSG_INSTALL = 2;
		private static final int MSG_ON_PACKAGE_INSTALLED = 3;
		private static final int MSG_SESSION_VERIFICATION_FAILURE = 4;

		/** XML constants used for persisting a session */
		static final String TAG_SESSION = "session";
		@@ -449,6 +450,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		packageName, returnCode, message, extras);

		break;
		case MSG_SESSION_VERIFICATION_FAILURE:
		final int error = msg.arg1;
		final String detailMessage = (String) msg.obj;
		onSessionVerificationFailure(error, detailMessage);
		break;
		}

		return true;
		@@ -1479,12 +1485,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}

		private PackageManagerException onSessionVerificationFailure(PackageManagerException e) {
		onSessionVerificationFailure(e.error, ExceptionUtils.getCompleteMessage(e));
		return e;
		}

		private void onSessionVerificationFailure(int error, String detailMessage) {
		// Session is sealed but could not be verified, we need to destroy it.
		destroyInternal();
		// Dispatch message to remove session from PackageInstallerService.
		dispatchSessionFinished(e.error, ExceptionUtils.getCompleteMessage(e), null);

		return e;
		dispatchSessionFinished(error, detailMessage, null);
		}

		private void onDataLoaderUnrecoverable() {
		@@ -2629,9 +2638,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		IDataLoader dataLoader = dataLoaderManager.getDataLoader(dataLoaderId);
		if (dataLoader == null) {
		mDataLoaderFinished = true;
		onSessionVerificationFailure(
		new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failure to obtain data loader"));
		dispatchSessionVerificationFailure(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failure to obtain data loader");
		return;
		}

		@@ -2676,9 +2684,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}
		case IDataLoaderStatusListener.DATA_LOADER_IMAGE_NOT_READY: {
		mDataLoaderFinished = true;
		onSessionVerificationFailure(
		new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failed to prepare image."));
		dispatchSessionVerificationFailure(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failed to prepare image.");
		if (manualStartAndDestroy) {
		dataLoader.destroy(dataLoaderId);
		}
		@@ -2686,9 +2693,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}
		case IDataLoaderStatusListener.DATA_LOADER_UNRECOVERABLE:
		mDataLoaderFinished = true;
		onSessionVerificationFailure(
		new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"DataLoader reported unrecoverable failure."));
		dispatchSessionVerificationFailure(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"DataLoader reported unrecoverable failure.");
		return;
		}
		} catch (RemoteException e) {
		@@ -2720,6 +2726,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		return false;
		}

		private void dispatchSessionVerificationFailure(int error, String detailMessage) {
		mHandler.obtainMessage(MSG_SESSION_VERIFICATION_FAILURE, error, -1,
		detailMessage).sendToTarget();
		}

		@Override
		public int[] getChildSessionIds() {
		final int[] childSessionIds = mChildSessionIds.copyKeys();

services/incremental/IncrementalService.cpp

+1 −4

Original line number	Diff line number	Diff line
		@@ -761,10 +761,7 @@ int IncrementalService::unbind(StorageId storage, std::string_view target) {
		std::unique_lock l2(ifs->lock);
		if (ifs->bindPoints.size() <= 1) {
		ifs->bindPoints.clear();
		std::thread([this, ifs, l2 = std::move(l2)]() mutable {
		mJni->initializeForCurrentThread();
		deleteStorageLocked(*ifs, std::move(l2));
		}).detach();
		} else {
		const std::string savedFile = std::move(bindIt->second.savedFilename);
		ifs->bindPoints.erase(bindIt);