commit 2c23e6ab750fb32a2258aebc8b4b249f1ff4efa7
author Zhaoyu Su <zhaoyu.xa.su@sony.com> Thu Aug 09 16:31:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 09 16:31:49 2018 -0700
tree e11928dfefad1bd844537748d7cd30ba46468f7e
parent efd3dd02b6109cf6e287f349318367c4a61b0557
parent b69559f8823d2510740d8bed4431dbe9b0ba2be5

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

Change-Id: Ia7b74d284a1385dc401eb168d82fc9cb8756192f

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fb74bf9..4e6a25e 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>
@@ -3279,6 +3275,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>