commit b69559f8823d2510740d8bed4431dbe9b0ba2be5
author Zhaoyu Su <zhaoyu.xa.su@sony.com> Thu Aug 09 16:20:45 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 09 16:20:45 2018 -0700
tree 340fccd320a66ee1e6019931edfb4c7bd1ba2924
parent c2a5c472909bb92cc13b812ece7b6164c1890524
parent 44360bc96aa7297be4f7a24f41e07ddbd7815934

Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
am: 44360bc96a

Change-Id: I6975c5213f74d4b9df343cae82d93f654774d1c3

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2713216..6f80e11 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -191,10 +191,6 @@
             android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.NFC_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="1">
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -3265,6 +3261,10 @@
                   android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
             <intent-filter android:priority="1">
+                <action android:name="android.settings.NFC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>