From 0a9f87667f3b58a3047655d91251ba388120e794 Mon Sep 17 00:00:00 2001
From: Zhaoyu Su <zhaoyu.xa.su@sony.com>
Date: Mon, 9 Jul 2018 14:50:47 +0800
Subject: [PATCH] Fix ACTION_NFC_SETTINGS doesn't show connection preference

NFC settings has been moved from "Device connection" to
"Connection preference". So ACTION_NFC_SETTINGS
should invoke "Connection preference" page.

Test: send intent with action "android.settings.NFC_SETTINGS"
Bug: 111424119
Change-Id: Iea9ddc876aa800f94585c434911be5dc8cedd550
---
 AndroidManifest.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 27132165b91..6f80e111600 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -190,10 +190,6 @@
             android:icon="@drawable/ic_homepage_connected_device"
             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" />
@@ -3264,6 +3260,10 @@
                   android:label="@string/connected_device_connections_title"
                   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" />