diff options
| author | Martijn Coenen <maco@google.com> | 2015-06-10 06:58:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 06:58:20 +0000 |
| commit | 706f23ddb9f18663d5ae70626e118e815a308c84 (patch) | |
| tree | a81e42372a0aaa8c3d77f83d646e687c4ced4fb4 /api | |
| parent | e687929f33f272fff9585bd0752d85ad519bc66d (diff) | |
| parent | bdc34b8440d1c79fcdb4e075137a528abd630cf5 (diff) | |
| download | frameworks_base-706f23ddb9f18663d5ae70626e118e815a308c84.zip frameworks_base-706f23ddb9f18663d5ae70626e118e815a308c84.tar.gz frameworks_base-706f23ddb9f18663d5ae70626e118e815a308c84.tar.bz2 | |
Merge "Make peer LLCP version an int." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index f73d56f..fdcda1f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19686,7 +19686,8 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; - field public final byte peerLlcpVersion; + field public final int peerLlcpMajorVersion; + field public final int peerLlcpMinorVersion; } public final class NfcManager { diff --git a/api/system-current.txt b/api/system-current.txt index e2d89a0..094e272 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21604,7 +21604,8 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; - field public final byte peerLlcpVersion; + field public final int peerLlcpMajorVersion; + field public final int peerLlcpMinorVersion; } public final class NfcManager { |