From 1c60b800840032773acb00d3baf809c41dff3e89 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Wed, 20 Mar 2019 12:28:25 -0700
Subject: [PATCH] Fix Slices in Panel no-op bug

Slices in panels stopped changing the underlying settings.

It is not always reproducible, but the error happend when PendingIntents
started failing to fire, and thus not connecting with the Broadcast
Receiver in Settings dedicated to handling Slice changes.

This fix always highlighted that we shouldn't be using TaskAffinity,
because there is no guarantee 3p apps don't spoof it.

In order to fix both the PendingIntent issue, and to de-dupe activities
from Settings vs Settings Panels: we use 'documentLaunchMode=always' instead.

Fixes: 129006165
Test: manual
Test: atest SettingsPanelTest
Change-Id: If94dd719a2e33c85c04a416868f565f719941234
---
 AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4bb1a8c530a..e3a0dec8037 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3016,9 +3016,8 @@
         <activity android:name=".panel.SettingsPanelActivity"
             android:label="@string/settings_panel_title"
             android:theme="@style/Theme.BottomDialog"
+            android:documentLaunchMode="always"
             android:excludeFromRecents="true"
-            android:launchMode="singleTop"
-            android:taskAffinity=".panel.SettingsPanelActivity"
             android:exported="true">
                  <intent-filter>
                      <action android:name="android.settings.panel.action.INTERNET_CONNECTIVITY" />