| Chunk |
|---|
| Conflicting content |
|---|
public void close() throws IOException {
mFd.close();
}
<<<<<<< HEAD
=======
/**
* Checks whether this file descriptor is for a memory file.
*/
private boolean isMemoryFile() throws IOException {
try {
return MemoryFile.isMemoryFile(mFd.getFileDescriptor());
} catch (IOException e) {
return false;
}
}
>>>>>>> ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6
/**
* Create and return a new auto-close input stream for this asset. This |
| Solution content |
|---|
public void close() throws IOException {
mFd.close();
}
/**
* Create and return a new auto-close input stream for this asset. This |
| File |
|---|
| AssetFileDescriptor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |