From 4a89abe27986f8c1572ffaa37a1d0fb73ce692d7 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@google.com>
Date: Mon, 19 Aug 2019 16:20:52 -0700
Subject: [PATCH 1/2] DO NOT MERGE - Track framework changes to
 crashApplication API

Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
---
 src/com/android/settings/password/PasswordUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/password/PasswordUtils.java b/src/com/android/settings/password/PasswordUtils.java
index 1ead492788c..5b75033f0f2 100644
--- a/src/com/android/settings/password/PasswordUtils.java
+++ b/src/com/android/settings/password/PasswordUtils.java
@@ -89,7 +89,8 @@ public final class PasswordUtils extends com.android.settingslib.Utils {
                     /* initialPid= */ -1,
                     getCallingAppPackageName(activityToken),
                     userId,
-                    message);
+                    message,
+                    false);
         } catch (RemoteException e) {
             Log.v(TAG, "Could not talk to activity manager.", e);
         }

From 12ed043fdb04485d25a08bfbfb3f1a2e32babdf6 Mon Sep 17 00:00:00 2001
From: Chris Tate <ctate@android.com>
Date: Fri, 6 Mar 2020 03:54:52 +0000
Subject: [PATCH 2/2] Revert "DO NOT MERGE - Track framework changes to
 crashApplicati..."

Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3

Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...

Change-Id: Ic68e376aa93c5c22a499d87f001bd22314c3f46e
---
 src/com/android/settings/password/PasswordUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/settings/password/PasswordUtils.java b/src/com/android/settings/password/PasswordUtils.java
index 5b75033f0f2..1ead492788c 100644
--- a/src/com/android/settings/password/PasswordUtils.java
+++ b/src/com/android/settings/password/PasswordUtils.java
@@ -89,8 +89,7 @@ public final class PasswordUtils extends com.android.settingslib.Utils {
                     /* initialPid= */ -1,
                     getCallingAppPackageName(activityToken),
                     userId,
-                    message,
-                    false);
+                    message);
         } catch (RemoteException e) {
             Log.v(TAG, "Could not talk to activity manager.", e);
         }