Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0c2d3d93: am b1c579df: am 706f23dd: Merge "Make peer LLCP version an int." into mnc-dev

Browse Source 
* commit '0c2d3d93dd2f8f0e355299188a8a77b5287b150f':
  Make peer LLCP version an int.
This commit is contained in:
Martijn Coenen
2015-06-10 07:34:42 +00:00
committed by Android Git Automerger
parent 0d7e33ec47 0c2d3d93dd
commit ab428b87f2
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -19688,7 +19688,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 {

3
api/system-current.txt
View File

@@ -21606,7 +21606,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 {

13
core/java/android/nfc/NfcEvent.java
View File

@@ -39,13 +39,18 @@ public final class NfcEvent {
public final NfcAdapter nfcAdapter;
/**
* The LLCP version of the peer associated with the NFC event.
* The major version is in the top nibble, the minor version is in the bottom nibble.
* The major LLCP version number of the peer associated with the NFC event.
*/
public final byte peerLlcpVersion;
public final int peerLlcpMajorVersion;
/**
* The minor LLCP version number of the peer associated with the NFC event.
*/
public final int peerLlcpMinorVersion;
NfcEvent(NfcAdapter nfcAdapter, byte peerLlcpVersion) {
this.nfcAdapter = nfcAdapter;
this.peerLlcpVersion = peerLlcpVersion;
this.peerLlcpMajorVersion = (peerLlcpVersion & 0xF0) >> 4;
this.peerLlcpMinorVersion = peerLlcpVersion & 0x0F;
}
}