| Chunk |
|---|
| Conflicting content |
|---|
private int mSaveCount;
@SuppressWarnings("unused")
private Canvas mCanvas;
<<<<<<< HEAD
@SuppressWarnings("unused")
private int mNativeSurface;
=======
private String mName;
>>>>>>> 863031983d3b4a0f31b9535123ec97dee55ac8cb
// The display metrics used to provide the pseudo canvas size for applications
// running in compatibility mode. This is set to null for non compatibility mode. |
| Solution content |
|---|
private int mSaveCount;
@SuppressWarnings("unused")
private Canvas mCanvas;
@SuppressWarnings("unused")
private int mNativeSurface;
private String mName;
// The display metrics used to provide the pseudo canvas size for applications
// running in compatibility mode. This is set to null for non compatibility mode. |
| File |
|---|
| Surface.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public String toString() {
<<<<<<< HEAD
return "Surface(native-token=" + mSurfaceControl + ")";
=======
return "Surface(name=" + mName + ", identity=" + getIdentity() + ")";
>>>>>>> 863031983d3b4a0f31b9535123ec97dee55ac8cb
}
private Surface(Parcel source) throws OutOfResourcesException { |
| Solution content |
|---|
@Override
public String toString() {
return "Surface(name=" + mName + ", identity=" + getIdentity() + ")";
}
private Surface(Parcel source) throws OutOfResourcesException { |
| File |
|---|
| Surface.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Return statement |