commit 5feacd987dd0eb4fa5e5f1492ad964ef0285ae93
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 13 02:02:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 13 02:02:00 2019 +0000
tree 7270c4cf3dbb1ac4e87972f01367e15821de3279
parent f02883c585eb794c86765d12b5ee4629a6189eca
parent e870b9fd19ce6615c7d9fe6e3c7ccd60dc1c3d92

Merge "Support both proprietary and common implementation for Mifare tag reading"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8821fac..6009074 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,7 +58,6 @@
     <uses-permission android:name="android.permission.USER_ACTIVITY" />
     <uses-permission android:name="android.permission.BIND_RESOLVER_RANKER_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
 
     <application android:name=".NfcApplication"
                  android:icon="@drawable/icon"

src/com/android/nfc/NfcDispatcher.java

diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java
index 36fd48c..a41cd2e 100644
--- a/src/com/android/nfc/NfcDispatcher.java
+++ b/src/com/android/nfc/NfcDispatcher.java
@@ -326,6 +326,7 @@
         }
 
         if (provisioningOnly) {
+            StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__PROVISION);
             if (message == null) {
                 // We only allow NDEF-message dispatch in provisioning mode
                 return DISPATCH_FAIL;
@@ -337,7 +338,6 @@
                 Log.e(TAG, "Dropping NFC intent in provisioning mode.");
                 return DISPATCH_FAIL;
             }
-            StatsLog.write(StatsLog.NFC_TAG_OCCURRED, StatsLog.NFC_TAG_OCCURRED__TYPE__PROVISION);
         }
 
         if (tryNdef(dispatch, message)) {

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 973cabd..9fad7c1 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2526,7 +2526,7 @@
                 }
             }
             int dispatchResult = mNfcDispatcher.dispatchTag(tag);
-            if (dispatchResult == NfcDispatcher.DISPATCH_FAIL) {
+            if (dispatchResult == NfcDispatcher.DISPATCH_FAIL && !mInProvisionMode) {
                 unregisterObject(tagEndpoint.getHandle());
                 if (mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED) {
                     Toast.makeText(mContext,