Projects >> android-frameworks-base-with-screenshot-tweaks >>aa2fe148496858e17d0ffd2b8d5d29b89d400934

Chunk
Conflicting content
    // don't allow clients to call this directly
    private Typeface(int ni) {
<<<<<<< HEAD
        if (0 == ni) {
            throw new RuntimeException("native typeface cannot be made");
=======
        if (ni == 0) {
            throw new IllegalStateException();
>>>>>>> 38581c9d1da8a6f31c507f693ed5a349995ec35c
        }
        native_instance = ni;
    }
Solution content
    // don't allow clients to call this directly
    private Typeface(int ni) {
        if (0 == ni) {
            throw new RuntimeException("native typeface cannot be made");
        }
        native_instance = ni;
    }
File
Typeface.java
Developer's decision
Version 1
Kind of conflict
If statement
Throw statement