commit ac94606cdf9be1592265baa8f20200c57e59761f
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 06 18:32:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 06 18:32:37 2018 +0000
tree e8cbe55cf1ae169a271b636ca66e0405867d6023
parent 3cd093efe8318ba3557fc3ac934a83223f3b8189
parent 6c6239bc96e3a07f3041ad0d194117524424ef26

Merge "Clean up task affinity"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bb43bbf..e2e89bd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2452,7 +2452,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" />