| Chunk |
|---|
| Conflicting content |
|---|
if (sp != null && !sp.hasFileChangedUnexpectedly()) {
return sp;
}
<<<<<<< HEAD
}
File f = getSharedPrefsFile(name);
FileInputStream str = null;
File backup = makeBackupFile(f);
if (backup.exists()) {
f.delete();
backup.renameTo(f);
=======
prefsFile = getSharedPrefsFile(name);
if (sp == null) {
sp = new SharedPreferencesImpl(prefsFile, mode, null);
sSharedPrefs.put(name, sp);
needInitialLoad = true;
}
>>>>>>> 64591009409618ee67e71c4b345cac50ad0e4e31
}
synchronized (sp) { |
| Solution content |
|---|
if (sp != null && !sp.hasFileChangedUnexpectedly()) {
return sp;
}
prefsFile = getSharedPrefsFile(name);
if (sp == null) {
sp = new SharedPreferencesImpl(prefsFile, mode, null);
sSharedPrefs.put(name, sp);
needInitialLoad = true;
}
}
synchronized (sp) { |
| File |
|---|
| ContextImpl.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |