Merge "Only lookup dataLoader when necessary." into sc-dev am: c9d7a7d7b7 am: a14b932bed (b1c07c8d) · Commits · e / os / android_frameworks_base

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

+29 −24

Original line number	Diff line number	Diff line
		@@ -3814,13 +3814,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}
		}

		final DataLoaderManager dataLoaderManager = mContext.getSystemService(
		DataLoaderManager.class);
		if (dataLoaderManager == null) {
		throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failed to find data loader manager service");
		}

		final DataLoaderParams params = this.params.dataLoaderParams;
		final boolean manualStartAndDestroy = !isIncrementalInstallation();
		final boolean systemDataLoader = isSystemDataLoaderInstallation();
		@@ -3845,20 +3838,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		return;
		}
		try {
		IDataLoader dataLoader = dataLoaderManager.getDataLoader(dataLoaderId);
		if (dataLoader == null) {
		mDataLoaderFinished = true;
		dispatchSessionValidationFailure(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failure to obtain data loader");
		return;
		}

		switch (status) {
		case IDataLoaderStatusListener.DATA_LOADER_BOUND: {
		if (manualStartAndDestroy) {
		FileSystemControlParcel control = new FileSystemControlParcel();
		control.callback = new FileSystemConnector(addedFiles);
		dataLoader.create(dataLoaderId, params.getData(), control, this);
		getDataLoader(dataLoaderId).create(dataLoaderId, params.getData(),
		control, this);
		}

		break;
		@@ -3867,12 +3853,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		if (manualStartAndDestroy) {
		// IncrementalFileStorages will call start after all files are
		// created in IncFS.
		dataLoader.start(dataLoaderId);
		getDataLoader(dataLoaderId).start(dataLoaderId);
		}
		break;
		}
		case IDataLoaderStatusListener.DATA_LOADER_STARTED: {
		dataLoader.prepareImage(
		getDataLoader(dataLoaderId).prepareImage(
		dataLoaderId,
		addedFiles.toArray(
		new InstallationFileParcel[addedFiles.size()]),
		@@ -3888,7 +3874,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		dispatchSessionSealed();
		}
		if (manualStartAndDestroy) {
		dataLoader.destroy(dataLoaderId);
		getDataLoader(dataLoaderId).destroy(dataLoaderId);
		}
		break;
		}
		@@ -3897,7 +3883,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		dispatchSessionValidationFailure(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failed to prepare image.");
		if (manualStartAndDestroy) {
		dataLoader.destroy(dataLoaderId);
		getDataLoader(dataLoaderId).destroy(dataLoaderId);
		}
		break;
		}
		@@ -3912,11 +3898,12 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		break;
		}
		case IDataLoaderStatusListener.DATA_LOADER_UNRECOVERABLE:
		mDataLoaderFinished = true;
		dispatchSessionValidationFailure(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"DataLoader reported unrecoverable failure.");
		break;
		}
		} catch (PackageManagerException e) {
		mDataLoaderFinished = true;
		dispatchSessionValidationFailure(e.error, ExceptionUtils.getCompleteMessage(e));
		} catch (RemoteException e) {
		// In case of streaming failure we don't want to fail or commit the session.
		// Just return from this method and allow caller to commit again.
		@@ -3991,7 +3978,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		}

		final long bindDelayMs = 0;
		if (!dataLoaderManager.bindToDataLoader(sessionId, params.getData(), bindDelayMs,
		if (!getDataLoaderManager().bindToDataLoader(sessionId, params.getData(), bindDelayMs,
		statusListener)) {
		throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failed to initialize data loader");
		@@ -4000,6 +3987,24 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		return false;
		}

		private DataLoaderManager getDataLoaderManager() throws PackageManagerException {
		DataLoaderManager dataLoaderManager = mContext.getSystemService(DataLoaderManager.class);
		if (dataLoaderManager == null) {
		throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failed to find data loader manager service");
		}
		return dataLoaderManager;
		}

		private IDataLoader getDataLoader(int dataLoaderId) throws PackageManagerException {
		IDataLoader dataLoader = getDataLoaderManager().getDataLoader(dataLoaderId);
		if (dataLoader == null) {
		throw new PackageManagerException(INSTALL_FAILED_MEDIA_UNAVAILABLE,
		"Failure to obtain data loader");
		}
		return dataLoader;
		}

		private void dispatchSessionValidationFailure(int error, String detailMessage) {
		mHandler.obtainMessage(MSG_SESSION_VALIDATION_FAILURE, error, -1,
		detailMessage).sendToTarget();