Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7422c7e authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Correct SecureNfc behavior in setting page" into qt-dev 

am: 0333b07a

Change-Id: Icc9b9b84572ef063051ade9a2ffbd6c1a30088da
parents 01626fd7 0333b07a

src/com/android/settings/nfc/SecureNfcEnabler.java

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ public class SecureNfcEnabler extends BaseNfcEnabler { 
                mPreference.setEnabled(false);

                break;

            case NfcAdapter.STATE_ON:

                mPreference.setChecked(mPreference.isEnabled());

                mPreference.setSummary(R.string.nfc_secure_toggle_summary);

                mPreference.setChecked(mPreference.isChecked());

                mPreference.setEnabled(true);

                break;

            case NfcAdapter.STATE_TURNING_ON: