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

am: 9eff3f90d8 Change-Id: I35b7606035a45c1705d0d8775b55c5d7ec9aa672
2017-08-09 20:22:10 +00:00
parent 7bc388d823 9eff3f90d8
commit bf81a17a31
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) {