From 46ddc965b999e8e63dd2e1529c97005d86a8cec6 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Tue, 5 Apr 2022 17:20:12 -0700
Subject: Update getUidProcessState to consider mPendingStartActivityUids.

Bug: 226299593
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Ib923eafb35c3e315e49dc7a896b5d3dcb8c6f896
Merged-In: Ib923eafb35c3e315e49dc7a896b5d3dcb8c6f896
---
 services/core/java/com/android/server/am/ActivityManagerService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 59dbe6c27bdb..6aa3af0bfb89 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -6790,6 +6790,9 @@ public class ActivityManagerService extends IActivityManager.Stub
         }
 
         synchronized (mProcLock) {
+            if (mPendingStartActivityUids.isPendingTopUid(uid)) {
+                return PROCESS_STATE_TOP;
+            }
             return mProcessList.getUidProcStateLOSP(uid);
         }
     }
-- 
cgit v1.2.3-59-g8ed1b