summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2016-06-09 15:49:25 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-06-15 16:58:49 -0700
commit1fb5a62c7147cf642a8d5f47258d43fc73470f14 (patch)
tree6efa24c18eb3c53c47fa886b3a35911cc6a331da
parent1cb3f7184804529b06c9b8e38e42edf873c639eb (diff)
downloadandroid_packages_apps_Nfc-1fb5a62c7147cf642a8d5f47258d43fc73470f14.tar.gz
android_packages_apps_Nfc-1fb5a62c7147cf642a8d5f47258d43fc73470f14.tar.bz2
android_packages_apps_Nfc-1fb5a62c7147cf642a8d5f47258d43fc73470f14.zip
Revert "Nfc: Clear transfer manager service on Destroy"
We weren't solving the right problem here, this commit ends up breaking the expected state of failure. This reverts commit fba2444642f4b1b25ed4a452cfffe42d57f4050b. Ticket: OPO-755 CYNGNOS-2866 Change-Id: I5d11bead92796ded1ad672e8e8e700703cccffa5 (cherry picked from commit 01ba29d3e8a8fead64c155a7f112e8f91d158c3f)
-rw-r--r--src/com/android/nfc/beam/BeamReceiveService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/nfc/beam/BeamReceiveService.java b/src/com/android/nfc/beam/BeamReceiveService.java
index e94f8bf9..9d24dd05 100644
--- a/src/com/android/nfc/beam/BeamReceiveService.java
+++ b/src/com/android/nfc/beam/BeamReceiveService.java
@@ -92,7 +92,6 @@ public class BeamReceiveService extends Service implements BeamTransferManager.C
unregisterReceiver(mBeamStatusReceiver);
}
unregisterReceiver(mBluetoothStateReceiver);
- mTransferManager = null;
}
boolean prepareToReceive(BeamTransferRecord transferRecord) {