Projects >> platform_frameworks_base >>a920f25fe55fc9afc7640902a200f19ce278588b

Chunk
Conflicting content 
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
<<<<<<< HEAD
import java.net.ProtocolException;
import java.nio.charset.Charsets;
=======
import java.nio.charset.StandardCharsets;
>>>>>>> fca0f92e0a9c121dcf28fa783e884f1fb4993374

/**
 * Reader that specializes in parsing {@code /proc/} files quickly. Walks
Solution content 
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.ProtocolException;
import java.nio.charset.StandardCharsets;

/**
 * Reader that specializes in parsing {@code /proc/} files quickly. Walks
File
ProcFileReader.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
     */
    public String nextString() throws IOException {
        final int tokenIndex = nextTokenIndex();
<<<<<<< HEAD
        if (tokenIndex == -1) {
            throw new ProtocolException("Missing required string");
        } else {
            return parseAndConsumeString(tokenIndex);
        }
=======
        final String s = new String(mBuffer, 0, tokenIndex, StandardCharsets.US_ASCII);
        consumeBuf(tokenIndex + 1);
        return s;
>>>>>>> fca0f92e0a9c121dcf28fa783e884f1fb4993374
    }

    /**
Solution content 
        } else {
            return parseAndConsumeString(tokenIndex);
        }
    }

    /**
     */
    public String nextString() throws IOException {
        final int tokenIndex = nextTokenIndex();
        if (tokenIndex == -1) {
            throw new ProtocolException("Missing required string");
File
ProcFileReader.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Variable