| Chunk |
|---|
| Conflicting content |
|---|
if (upgradeVersion == 34) {
db.beginTransaction();
try {
<<<<<<< HEAD
String value =
mContext.getResources().getBoolean(R.bool.assisted_gps_enabled) ? "1" : "0";
db.execSQL("INSERT OR IGNORE INTO secure(name,value) values('" +
Settings.Secure.ASSISTED_GPS_ENABLED + "','" + value + "');");
=======
SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
+ " VALUES(?,?);");
loadSecure35Settings(stmt);
stmt.close();
>>>>>>> cf098294da7a820d5c30d8ed2006ed5446ee1da9
db.setTransactionSuccessful();
} finally {
db.endTransaction(); |
| Solution content |
|---|
if (upgradeVersion == 34) {
db.beginTransaction();
try {
String value =
mContext.getResources().getBoolean(R.bool.assisted_gps_enabled) ? "1" : "0";
db.execSQL("INSERT OR IGNORE INTO secure(name,value) values('" +
Settings.Secure.ASSISTED_GPS_ENABLED + "','" + value + "');");
db.setTransactionSuccessful();
} finally {
db.endTransaction(); |
| File |
|---|
| DatabaseHelper.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
} finally {
db.endTransaction();
}
<<<<<<< HEAD
upgradeVersion = 35;
}
=======
upgradeVersion = 35;
}
>>>>>>> cf098294da7a820d5c30d8ed2006ed5446ee1da9
if (upgradeVersion != currentVersion) {
Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion
+ ", must wipe the settings provider"); |
| Solution content |
|---|
} finally {
db.endTransaction();
}
upgradeVersion = 35;
}
if (upgradeVersion == 35) {
db.beginTransaction();
try {
SQLiteStatement stmt = db.compileStatement("INSERT OR IGNORE INTO secure(name,value)"
+ " VALUES(?,?);");
loadSecure35Settings(stmt);
stmt.close();
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
upgradeVersion = 36;
}
if (upgradeVersion != currentVersion) {
Log.w(TAG, "Got stuck trying to upgrade from version " + upgradeVersion
+ ", must wipe the settings provider"); |
| File |
|---|
| DatabaseHelper.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Variable |