commit eb43cc70c81f9e2d289c5dcc755fb35d4ecbe29a
author Fan Zhang <zhfan@google.com> Wed Sep 26 15:23:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 26 15:23:11 2018 -0700
tree b7af18f1a8bc8ab5a7c854a70573a816ce0a3849
parent af7aed6d79727f0a51958701175200d2988bcc28
parent ff3652e0a34de0dc118cf85bb50725cacb9d0967

Clean up task affinity.
am: ff3652e0a3

Change-Id: I6727cae2ce9330860ad40104b20e00e8ecf58556

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17f8303..ba407c9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -727,7 +727,6 @@
             android:label="@string/zen_mode_settings_title"
             android:icon="@drawable/ic_notifications"
             android:exported="true"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ZEN_MODE_SETTINGS" />
@@ -929,7 +928,6 @@
             android:label="@string/night_display_title"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
             android:icon="@drawable/ic_settings_night_display"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2616,7 +2614,6 @@
         <activity
             android:name="Settings$ZenAccessSettingsActivity"
             android:label="@string/manage_zen_access_title"
-            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />