Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev am: 9eff3f90d8 am: bf81a17a31

am: 706c6ba20e Change-Id: Ie112f53cb222845c75a71def7b4aaf5dc3c8753e
2017-08-10 02:21:48 +00:00
parent f3692132ca 706c6ba20e
commit 01e0523441
1 changed files with 1 additions and 0 deletions
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -98,6 +98,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
        // Turn NFC on/off

        final boolean desiredState = (Boolean) value;
+        mSwitch.setChecked(desiredState);
        mSwitch.setEnabled(false);

        if (desiredState) {