diff options
| author | Martijn Coenen <maco@google.com> | 2015-04-17 07:02:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-17 07:02:59 +0000 |
| commit | e386f7f5108e9c2aa7547394f23d5936d7993cfe (patch) | |
| tree | 077d119576c620bd310dea03f8e5e9afa8143905 /api | |
| parent | e5e49a175c27b95d6b8928ab435bfde9f9db3c81 (diff) | |
| parent | fd70bb13678c371b8cf53a416ed90ed69caaae9e (diff) | |
| download | frameworks_base-e386f7f5108e9c2aa7547394f23d5936d7993cfe.zip frameworks_base-e386f7f5108e9c2aa7547394f23d5936d7993cfe.tar.gz frameworks_base-e386f7f5108e9c2aa7547394f23d5936d7993cfe.tar.bz2 | |
Merge "Expose peer LLCP version in NDEF callbacks."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c21fa0a..22c9afd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18445,6 +18445,7 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; + field public final byte peerLlcpVersion; } public final class NfcManager { diff --git a/api/system-current.txt b/api/system-current.txt index 6732a09..209a526 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -20029,6 +20029,7 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; + field public final byte peerLlcpVersion; } public final class NfcManager { |