Merge "Make sure service handles are live before passing to other objects." into gingerbread (b73203ab) · Commits · e / os / android_frameworks_base

core/java/android/nfc/NfcAdapter.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public final class NfcAdapter {
		* @hide
		*/
		public INfcAdapter getService() {
		isEnabled(); // NOP call to recover sService if it is stale
		return sService;
		}

		@@ -325,6 +326,7 @@ public final class NfcAdapter {
		* @hide
		*/
		public INfcTag getTagService() {
		isEnabled(); // NOP call to recover sTagService if it is stale
		return sTagService;
		}