| Chunk |
|---|
| Conflicting content |
|---|
private static final String TAG = "Launcher.LauncherProvider";
private static final boolean LOGD = false;
<<<<<<< HEAD
private static final int DATABASE_VERSION = 21;
=======
private static final int MIN_DATABASE_VERSION = 12;
private static final int DATABASE_VERSION = 22;
>>>>>>> 633325c4c22061c745ff89f9141f18cca29b352b
static final String OLD_AUTHORITY = "com.android.launcher2.settings";
static final String AUTHORITY = ProviderConfig.AUTHORITY; |
| Solution content |
|---|
private static final String TAG = "Launcher.LauncherProvider";
private static final boolean LOGD = false;
private static final int DATABASE_VERSION = 21;
static final String OLD_AUTHORITY = "com.android.launcher2.settings";
static final String AUTHORITY = ProviderConfig.AUTHORITY; |
| File |
|---|
| LauncherProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
// DB was not upgraded
Log.w(TAG, "Destroying all old data.");
createEmptyDB(db);
=======
if (version == 21) {
// Recreate workspace table with screen id a primary key
if (recreateWorkspaceTable(db)) {
version = 22;
}
}
if (version != DATABASE_VERSION) {
Log.w(TAG, "Destroying all old data.");
createEmptyDB(db);
}
>>>>>>> 633325c4c22061c745ff89f9141f18cca29b352b
}
@Override |
| Solution content |
|---|
}
}
// DB was not upgraded
Log.w(TAG, "Destroying all old data.");
createEmptyDB(db);
}
@Override |
| File |
|---|
| LauncherProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |