| Chunk |
|---|
| Conflicting content |
|---|
} catch (Throwable e) {
reportWtf("observing native crashes", e);
}
<<<<<<< HEAD
try {
startSystemUi(contextF);
} catch (Throwable e) {
reportWtf("starting System UI", e);
}
=======
startSystemUi(contextF);
>>>>>>> a34f0cd99c03c345d1dcb91c5038f558cfc1c7f1
try {
if (mountServiceF != null) mountServiceF.systemReady();
} catch (Throwable e) { |
| Solution content |
|---|
} catch (Throwable e) {
reportWtf("observing native crashes", e);
}
try {
startSystemUi(contextF);
} catch (Throwable e) {
reportWtf("starting System UI", e);
}
try {
if (mountServiceF != null) mountServiceF.systemReady();
} catch (Throwable e) { |
| File |
|---|
| SystemServer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |
| Chunk |
|---|
| Conflicting content |
|---|
if (hr.app == null && app.uid == hr.info.applicationInfo.uid
&& processName.equals(hr.processName)) {
try {
<<<<<<< HEAD
if (realStartActivityLocked(hr, app, true, true, null)) {
=======
if (realStartActivityLocked(hr, app, true, true)) {
>>>>>>> a34f0cd99c03c345d1dcb91c5038f558cfc1c7f1
didSomething = true;
}
} catch (Exception e) { |
| Solution content |
|---|
} catch (Exception e) {
if (hr.app == null && app.uid == hr.info.applicationInfo.uid
&& processName.equals(hr.processName)) {
try {
if (realStartActivityLocked(hr, app, true, true, null)) {
didSomething = true;
} |
| File |
|---|
| ActivityStackSupervisor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |