am f780350e: am b73203ab: Merge "Make sure service handles are live before passing to other objects." into gingerbread

* commit 'f780350edb403739fee1a99b0ca91541f5ec0b91':
  Make sure service handles are live before passing to other objects.

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;
     }