Projects >> platform_frameworks_base >>2b01f31a3a83176147c2f0eef9787f5c754f9903

Chunk
Conflicting content 
    }

    private void makeBlink() {
<<<<<<< HEAD
        if (!isCursorVisible()) {
=======
        if (!mCursorVisible || !isTextEditable()) {
>>>>>>> 1ba2a47b82b950934ddf04570fb24124aec7f249
            if (mBlink != null) {
                mBlink.removeCallbacks(mBlink);
            }
Solution content 
    }

    private void makeBlink() {
        if (!isCursorVisible()) {
            if (mBlink != null) {
                mBlink.removeCallbacks(mBlink);
            }
File
TextView.java
Developer's decision
Version 1
Kind of conflict
If statement