Projects >> android_frameworks_base >>caa9aa08aaa5d3e879fcccad5c4bcb1c79fba6e3

Chunk
Conflicting content 
     */
    private static final long DEFAULT_IDLE_MILLIS = 15 * 60 * 1000; /* 15 minutes */

<<<<<<< HEAD
=======
    private static final String WAKELOCK_TAG = "*wifi*";

>>>>>>> 0ce12e210eaef554e96752af2553dadc431d6d09
    /**
     * Number of allowed radio frequency channels in various regulatory domains.
     * This list is sufficient for 802.11b/g networks (2.4GHz range).
Solution content 
     */
    private static final long DEFAULT_IDLE_MILLIS = 15 * 60 * 1000; /* 15 minutes */

    /**
     * Number of allowed radio frequency channels in various regulatory domains.
     * This list is sufficient for 802.11b/g networks (2.4GHz range).
File
WifiService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
            for (int i=0; i>>>>>> 0ce12e210eaef554e96752af2553dadc431d6d09
        }
        mWifiStateMachine.updateBatteryWorkSource(mTmpWorkSource);
    }
Solution content 
            for (int i=0; i
File
WifiService.java
Developer's decision
Version 1
Kind of conflict
Method invocation