Merge "nfc(api): Restore behavior from Android T" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
004bbcdb14
@@ -711,6 +711,7 @@ public final class NfcAdapter {
|
|||||||
/* Stale sService pointer */
|
/* Stale sService pointer */
|
||||||
if (sIsInitialized) sIsInitialized = false;
|
if (sIsInitialized) sIsInitialized = false;
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
/* Try to initialize the service */
|
/* Try to initialize the service */
|
||||||
NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
|
NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
|
||||||
|
|||||||
Reference in New Issue
Block a user