Merge "Remove stale connections to DataLoaders." (632846fd) · Commits · e / os / android_frameworks_base

services/incremental/IncrementalService.cpp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2831,6 +2831,12 @@ bool IncrementalService::DataLoaderStub::fsmStep() {

	binder::Status IncrementalService::DataLoaderStub::onStatusChanged(MountId mountId, int newStatus) {		binder::Status IncrementalService::DataLoaderStub::onStatusChanged(MountId mountId, int newStatus) {
	if (!isValid()) {		if (!isValid()) {
			if (newStatus == IDataLoaderStatusListener::DATA_LOADER_BOUND) {
			// Async "bound" came to already destroyed stub.
			// Unbind immediately to avoid invalid stub sitting around in DataLoaderManagerService.
			mService.mDataLoaderManager->unbindFromDataLoader(mountId);
			return binder::Status::ok();
			}
	return binder::Status::		return binder::Status::
	fromServiceSpecificError(-EINVAL, "onStatusChange came to invalid DataLoaderStub");		fromServiceSpecificError(-EINVAL, "onStatusChange came to invalid DataLoaderStub");
	}		}