From 253c509cb0d36b39c3d878c0caf7f1eca194068a Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Thu, 13 Jan 2011 09:22:57 -0800
Subject: Make sure service handles are live before passing to other objects.

Change-Id: Ia3fa799b56463f313da0e84a50c4dc75d584eaca
---
 core/java/android/nfc/NfcAdapter.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/java/android/nfc/NfcAdapter.java')

diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index 769e2d0..b4f2086 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -316,6 +316,7 @@ public final class NfcAdapter {
      * @hide
      */
     public INfcAdapter getService() {
+        isEnabled();  // NOP call to recover sService if it is stale
         return sService;
     }
 
@@ -324,6 +325,7 @@ public final class NfcAdapter {
      * @hide
      */
     public INfcTag getTagService() {
+        isEnabled();  // NOP call to recover sTagService if it is stale
         return sTagService;
     }
 
-- 
cgit v1.1