diff --git a/api/current.txt b/api/current.txt
index c242af157b556..b72174fac4759 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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 {
diff --git a/api/system-current.txt b/api/system-current.txt
index ec3f985fa5ccc..edbcd9e739d82 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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 {
diff --git a/core/java/android/nfc/NfcEvent.java b/core/java/android/nfc/NfcEvent.java
index cf1d71a8b5e87..aff4f52f2bab9 100644
--- a/core/java/android/nfc/NfcEvent.java
+++ b/core/java/android/nfc/NfcEvent.java
@@ -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;
     }
 }