diff options
| author | Nick Pelly <npelly@google.com> | 2011-07-15 10:47:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-15 10:47:34 -0700 |
| commit | 9e6b5d1f092fab35e497f81035586afae529cda6 (patch) | |
| tree | 217021b7b2ad5d2184fb27435f2a96913e2b44bc /src | |
| parent | 399a21b88d408759757cccf88a1c4af140fb71f0 (diff) | |
| parent | b3d770c4ff05992f81f2d172e6d2c514443674a5 (diff) | |
| download | packages_apps_nfc-9e6b5d1f092fab35e497f81035586afae529cda6.zip packages_apps_nfc-9e6b5d1f092fab35e497f81035586afae529cda6.tar.gz packages_apps_nfc-9e6b5d1f092fab35e497f81035586afae529cda6.tar.bz2 | |
am b3d770c4: Merge "- Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts." into gingerbread
* commit 'b3d770c4ff05992f81f2d172e6d2c514443674a5':
- Properly initialize NfcService.mEeRoutingState to ROUTE_OFF . This allows NfcAdapterExtras.getCardEmulationRoute() to properly return ROUTE_OFF when the service restarts.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 4159e66..d7273f5 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(); |