Projects >> frameworks_base_disabled >>2ee29c3bf39d3cf943f470402f8a1217e1ad5b10

Chunk
Conflicting content 
    public int interceptKeyBeforeQueueing(long whenNanos, int keyCode, boolean down,
            int policyFlags, boolean isScreenOn) {
        int result = ACTION_PASS_TO_USER;
<<<<<<< HEAD
        if ((policyFlags & WindowManagerPolicy.FLAG_TRUSTED) == 0) {
            return result;
        }
=======
>>>>>>> 03aa28fb36589a3d601be08e75c08a24c4344d6f

        if (down && (policyFlags & WindowManagerPolicy.FLAG_VIRTUAL) != 0) {
            performHapticFeedbackLw(null, HapticFeedbackConstants.VIRTUAL_KEY, false);
Solution content 
    public int interceptKeyBeforeQueueing(long whenNanos, int keyCode, boolean down,
            int policyFlags, boolean isScreenOn) {
        int result = ACTION_PASS_TO_USER;

        if (down && (policyFlags & WindowManagerPolicy.FLAG_VIRTUAL) != 0) {
            performHapticFeedbackLw(null, HapticFeedbackConstants.VIRTUAL_KEY, false);
File
PhoneWindowManager.java
Developer's decision
Version 2
Kind of conflict
If statement