From c7635e582f2fbbec80fde35c60b4ff24385778ae Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 4 Mar 2019 14:27:08 -0800
Subject: [PATCH] Remove task affinity on misc settings

The task affinity is making upnav button acting strange.

Fixes: 118789456
Fixes: 127335758
Test: rebuild and go through Settings search
Change-Id: I911298dfc995c271cf0d34f24cd87caecd153b34
---
 AndroidManifest.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e60637582a7..c2bb484fe72 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -932,8 +932,7 @@
 
         <activity
             android:name="Settings$ManageApplicationsActivity"
-            android:label="@string/applications_settings"
-            android:parentActivityName="Settings">
+            android:label="@string/applications_settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
                 <action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
@@ -1306,8 +1305,7 @@
 
         <activity
             android:name="Settings$UsageAccessSettingsActivity"
-            android:label="@string/usage_access_title"
-            android:parentActivityName="Settings">
+            android:label="@string/usage_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />