Projects >> android_packages_apps_Nfc >>ba8f9efd028a12ce3f78769602ea9e409261f099

Chunk
Conflicting content 
                Log.d(TAG,"checking on firmware download");
                boolean nfc_on = mPrefs.getBoolean(PREF_NFC_ON, NFC_ON_DEFAULT);
                if (nfc_on) {
<<<<<<< HEAD
                    Log.d(TAG,"NFC is on. Doing normal stuff");
                    _enable(false, true);
                } else {
                    Log.d(TAG,"NFC is off.  Checking firmware version");
                    _maybeUpdateFirmware();
=======
                    _enable(false, true);
>>>>>>> 9040f348d0c6b93be59e3155bec20c7875fd577e
                }
                resetSeOnFirstBoot();
            }
Solution content 
                Log.d(TAG,"checking on firmware download");
                boolean nfc_on = mPrefs.getBoolean(PREF_NFC_ON, NFC_ON_DEFAULT);
                if (nfc_on) {
                    Log.d(TAG,"NFC is on. Doing normal stuff");
                    _enable(false, true);
                } else {
                    Log.d(TAG,"NFC is off.  Checking firmware version");
                    _maybeUpdateFirmware();
                }
                resetSeOnFirstBoot();
            }
File
NfcService.java
Developer's decision
Version 1
Kind of conflict
Method invocation