Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev

2017-08-09 05:29:12 +00:00
parent 4bcc3eb193 1eab553653
commit 9eff3f90d8
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) {