From 1eab5536534be31a2b73d7aa50aeeff600dd2132 Mon Sep 17 00:00:00 2001
From: Ruchi Kandoi <kandoiruchi@google.com>
Date: Tue, 8 Aug 2017 13:41:31 -0700
Subject: [PATCH] Avoid Race condition with accessibility for NFC toggle switch

Bug: 64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
---
 src/com/android/settings/nfc/NfcEnabler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 5bda1ad361f..14ee779bed4 100644
--- 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) {