Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[incremental service] avoid nullptr dereferencing" into rvc-dev am: eee228f65e am: 2575a8b68c

Browse Source 
Change-Id: I6b65a8e5e9ef45e5549d757f09b9ddd93641d2e7
This commit is contained in:
Songchun Fan
2020-03-18 05:24:44 +00:00
committed by Automerger Merge Worker
parent 975c802e27 2575a8b68c
commit f8618237e6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/incremental/IncrementalService.cpp
View File

@@ -1089,7 +1089,9 @@ bool IncrementalService::prepareDataLoader(IncrementalService::IncFsMount& ifs,
base::unique_fd(::dup(ifs.control.pendingReads)));
fsControlParcel.incremental->log.reset(base::unique_fd(::dup(ifs.control.logs)));
sp<IncrementalDataLoaderListener> listener =
new IncrementalDataLoaderListener(*this, *externalListener);
new IncrementalDataLoaderListener(*this,
externalListener ? *externalListener
: DataLoaderStatusListener());
bool created = false;
auto status = mDataLoaderManager->initializeDataLoader(ifs.mountId, *dlp, fsControlParcel,
listener, &created);
@@ -1229,8 +1231,8 @@ binder::Status IncrementalService::IncrementalDataLoaderListener::onStatusChange
std::unique_lock l(incrementalService.mLock);
const auto& ifs = incrementalService.getIfsLocked(mountId);
if (!ifs) {
LOG(WARNING) << "Received data loader status " << int(newStatus) << " for unknown mount "
<< mountId;
LOG(WARNING) << "Received data loader status " << int(newStatus)
<< " for unknown mount " << mountId;
return binder::Status::ok();
}
ifs->dataLoaderStatus = newStatus;