| Chunk |
|---|
| Conflicting content |
|---|
}
}
}
<<<<<<< HEAD
for (int j=app.conProviders.size()-1; j>=0; j--) {
ContentProviderRecord cpr = app.conProviders.get(j).provider;
if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {
updateLruProcessInternalLocked(cpr.proc, oomAdj,
updateActivityTime, i+1);
=======
if (app.conProviders.size() > 0) {
for (ContentProviderRecord cpr : app.conProviders.keySet()) {
if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {
updateLruProcessInternalLocked(cpr.proc, false,
updateActivityTime, i+1);
}
>>>>>>> cddaf4d572ab5de2635b5d0efeda3ce42b97ddd0
}
}
|
| Solution content |
|---|
}
}
}
for (int j=app.conProviders.size()-1; j>=0; j--) {
ContentProviderRecord cpr = app.conProviders.get(j).provider;
if (cpr.proc != null && cpr.proc.lruSeq != mLruSeq) {
updateLruProcessInternalLocked(cpr.proc, false,
updateActivityTime, i+1);
}
}
|
| File |
|---|
| ActivityManagerService.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| For statement |
| If statement |
| Method invocation |
| Variable |