summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Tsai <robtsai@google.com>2011-07-12 23:11:01 -0700
committerThe Android Automerger <android-build@android.com>2011-07-18 22:43:24 -0700
commit8279e9c8510c05d4323c82a45473e92055d7df82 (patch)
tree1f5833ac2ed8466d16949a6f4057107ef0837ecb
parent5f929dbeb216421a91d7994524b5bcd6169dd82c (diff)
downloadpackages_apps_nfc-8279e9c8510c05d4323c82a45473e92055d7df82.zip
packages_apps_nfc-8279e9c8510c05d4323c82a45473e92055d7df82.tar.gz
packages_apps_nfc-8279e9c8510c05d4323c82a45473e92055d7df82.tar.bz2
- Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allows
NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts. Change-Id: I833bb2afae06778a0e4bdd5f5d25374636885f42
-rwxr-xr-xsrc/com/android/nfc/NfcService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 17b6416..0bb4e57 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -323,6 +323,7 @@ public class NfcService extends Application {
NfcAdapter.ACTION_TECH_DISCOVERED, NfcAdapter.ACTION_TECH_DISCOVERED);
mSecureElement = new NativeNfcSecureElement();
+ mEeRoutingState = ROUTE_OFF;
mPrefs = mContext.getSharedPreferences(PREF, Context.MODE_PRIVATE);
mPrefsEditor = mPrefs.edit();