commit a58843e9fedbd2a494b6ffc6df52061c9d6f02f2
author Craig Lafayette <craiglafa@google.com> Fri Mar 27 06:54:28 2015 -0400
committer Craig Lafayette <craiglafa@google.com> Fri Mar 27 06:55:22 2015 -0400
tree 1c11f4e925a35d7af6a0c1cf05763459d95f3763
parent e5824821c7fe4598fa78a654ac7f416d57eae330

Read new NFC MIME type.

Change-Id: I70b50f2c1a824731e9314035cdbcfbed57de0132

src/com/android/managedprovisioning/MessageParser.java

diff --git a/src/com/android/managedprovisioning/MessageParser.java b/src/com/android/managedprovisioning/MessageParser.java
index 8b3fa25..db9b205 100644
--- a/src/com/android/managedprovisioning/MessageParser.java
+++ b/src/com/android/managedprovisioning/MessageParser.java
@@ -47,6 +47,7 @@
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_BT_DEVICE_ID;
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_BT_USE_PROXY;
 import static android.app.admin.DevicePolicyManager.MIME_TYPE_PROVISIONING_NFC;
+import static android.app.admin.DevicePolicyManager.MIME_TYPE_PROVISIONING_NFC_V2;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import android.content.ComponentName;
@@ -249,7 +250,8 @@
             NdefRecord firstRecord = msg.getRecords()[0];
             String mimeType = new String(firstRecord.getType(), UTF_8);
 
-            if (MIME_TYPE_PROVISIONING_NFC.equals(mimeType)) {
+            if (MIME_TYPE_PROVISIONING_NFC.equals(mimeType) ||
+                    MIME_TYPE_PROVISIONING_NFC_V2.equals(mimeType)) {
                 ProvisioningParams params = parseProperties(new String(firstRecord.getPayload()
                                 , UTF_8));
                 params.mStartedByNfc = true;