Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread (e69f4267) · Commits · e / os / android_frameworks_base

nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java

+16 −9

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ public final class NfcAdapterExtras {

		// protected by NfcAdapterExtras.class, and final after first construction
		private static INfcAdapterExtras sService;
		private static boolean sIsInitialized = false;
		private static NfcAdapterExtras sSingleton;
		private static NfcExecutionEnvironment sEmbeddedEe;
		private static CardEmulationRoute sRouteOff;
		@@ -74,14 +73,22 @@ public final class NfcAdapterExtras {
		*/
		public static NfcAdapterExtras get(NfcAdapter adapter) {
		synchronized(NfcAdapterExtras.class) {
		if (!sIsInitialized) {
		sIsInitialized = true;
		if (sSingleton == null) {
		try {
		sService = adapter.getNfcAdapterExtrasInterface();
		sEmbeddedEe = new NfcExecutionEnvironment(sService);
		sRouteOff = new CardEmulationRoute(CardEmulationRoute.ROUTE_OFF, null);
		sRouteOnWhenScreenOn = new CardEmulationRoute(
		CardEmulationRoute.ROUTE_ON_WHEN_SCREEN_ON, sEmbeddedEe);
		sSingleton = new NfcAdapterExtras();
		} finally {
		if (sSingleton == null) {
		sService = null;
		sEmbeddedEe = null;
		sRouteOff = null;
		sRouteOnWhenScreenOn = null;
		}
		}
		}
		return sSingleton;
		}