From 0ba870e4c4bb370101d7a0720d4fd5dad5a9b5bd Mon Sep 17 00:00:00 2001
From: Tim Murray <timmurray@google.com>
Date: Mon, 3 Apr 2023 22:21:19 -0700
Subject: [PATCH] AppErrors: unfreeze app before scheduling crash

Test: atest CtsPermissionTestCases:android.permission.cts.OneTimePermissionTest#testStickyServiceMaintainsPermissionOnRestart
Bug: 276653423
Change-Id: I6baca60872eb1bc2ba2c1f0bd7c66b70250c252c
---
 services/core/java/com/android/server/am/AppErrors.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index 08c1de61d7fbb..c343ec24412a0 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -534,6 +534,8 @@ class AppErrors {
             }
         }
 
+        mService.mOomAdjuster.mCachedAppOptimizer.unfreezeProcess(initialPid,
+                CachedAppOptimizer.UNFREEZE_REASON_PROCESS_END);
         proc.scheduleCrashLocked(message, exceptionTypeId, extras);
         if (force) {
             // If the app is responsive, the scheduled crash will happen as expected