From b5f53a4a3e10e1c42dcd3724cb6d235ccf38d6cc Mon Sep 17 00:00:00 2001
From: Hui Yu <huiyu@google.com>
Date: Mon, 1 Mar 2021 17:28:17 -0800
Subject: Fix a bug when uid is removed from temp-allowlist.

The bug is caused by previous merge conflict.

Bug: 181538234
Test: atest android.app.cts.ActivityManagerProcessStateTest
Change-Id: I687fa0872a87d933f005acaca2f2159099263162
---
 services/core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 7cd494976c94..e8a4fa20cd30 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15179,8 +15179,8 @@ public class ActivityManagerService extends IActivityManager.Stub
                             mFgsStartTempAllowList.add(changingUid, durationMs, reasonCode, reason,
                                     callingUid);
                         }
-                        setAppIdTempAllowlistStateLSP(changingUid, adding);
                     }
+                    setAppIdTempAllowlistStateLSP(changingUid, adding);
                 }
             }
         }
-- 
cgit v1.2.3-59-g8ed1b