diff options
| author | Martijn Coenen <maco@google.com> | 2013-11-15 17:34:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-15 17:34:29 +0000 |
| commit | 7fbed8456f3f73f64bdc20467c69f02ec2aece0c (patch) | |
| tree | 909d8795d365b6ac438681cfa9215892da6f8e2e /core/java | |
| parent | 30cb5c3ffa259f2a6df02a81a766c716477f4b92 (diff) | |
| parent | f180f30b0de7330c415eee0bac83b6e41242ad9b (diff) | |
| download | frameworks_base-7fbed8456f3f73f64bdc20467c69f02ec2aece0c.zip frameworks_base-7fbed8456f3f73f64bdc20467c69f02ec2aece0c.tar.gz frameworks_base-7fbed8456f3f73f64bdc20467c69f02ec2aece0c.tar.bz2 | |
Merge "Add "urn:nfc" shortener."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/nfc/NdefRecord.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java index 2b58818..de481cf 100644 --- a/core/java/android/nfc/NdefRecord.java +++ b/core/java/android/nfc/NdefRecord.java @@ -269,6 +269,7 @@ public final class NdefRecord implements Parcelable { "urn:epc:pat:", // 0x20 "urn:epc:raw:", // 0x21 "urn:epc:", // 0x22 + "urn:nfc:", // 0x23 }; private static final int MAX_PAYLOAD_SIZE = 10 * (1 << 20); // 10 MB payload limit |