Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc34b84 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Make peer LLCP version an int. 

And split major/minor.

Bug: 21343778
Change-Id: Ie9f0ecc9172849d3b088a0c1ce6d872b2f607919
parent 0d8513ad

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -19642,7 +19642,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 {

























api/system-current.txt



+2
−1




























Original line number
Diff line number
Diff line








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

























core/java/android/nfc/NfcEvent.java



+9
−4




























Original line number
Diff line number
Diff line








@@ -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;















    }















}