| Chunk |
|---|
| Conflicting content |
|---|
"Error: Activity not started, unknown error code " + res);
break;
}
<<<<<<< HEAD
if (mWaitOption && launched) {
if (result == null) {
result = new IActivityManager.WaitResult();
result.who = intent.getComponent();
}
System.out.println("Status: " + (result.timeout ? "timeout" : "ok"));
if (result.who != null) {
System.out.println("Activity: " + result.who.flattenToShortString());
}
if (result.thisTime >= 0) {
System.out.println("ThisTime: " + result.thisTime);
}
if (result.totalTime >= 0) {
System.out.println("TotalTime: " + result.totalTime);
}
System.out.println("Complete");
}
=======
>>>>>>> 69acb6b746c82f88607b3365795ebb3279188eed
}
private void sendBroadcast() throws Exception { |
| Solution content |
|---|
"Error: Activity not started, unknown error code " + res);
break;
}
if (mWaitOption && launched) {
if (result == null) {
result = new IActivityManager.WaitResult();
result.who = intent.getComponent();
}
System.out.println("Status: " + (result.timeout ? "timeout" : "ok"));
if (result.who != null) {
System.out.println("Activity: " + result.who.flattenToShortString());
}
if (result.thisTime >= 0) {
System.out.println("ThisTime: " + result.thisTime);
}
if (result.totalTime >= 0) {
System.out.println("TotalTime: " + result.totalTime);
}
System.out.println("Complete");
}
}
private void sendBroadcast() throws Exception { |
| File |
|---|
| Am.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |