From 2122bbf1e98b6067113a6c68928c2153094643f4 Mon Sep 17 00:00:00 2001
From: Felka Chang <felkachang@google.com>
Date: Fri, 19 Nov 2021 00:19:07 +0800
Subject: [PATCH] Add live annotation for Computer.getProcessesForUid

PackageManagerServiceTest#testComputerStructure verify both structure
of Computer and ComputerEngine.
* Computer.getProcessesForUid should have the live annotation.
* PackageManagerServiceTest#testComputerStructure should skip static
  lambda function. a.k.a ComputerEngine.sProviderInitOrderSorter

Fixes: 206896767

Test: TP="FrameworksServicesTests" ; atest \
    ${TP}:com.android.server.pm.PackageManagerServiceTest
Change-Id: Ic7002ce72b20d7929bd1e3e0bb9f29367d2aea8a
---
 services/core/java/com/android/server/pm/Computer.java       | 4 ++++
 .../src/com/android/server/pm/PackageManagerServiceTest.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/services/core/java/com/android/server/pm/Computer.java b/services/core/java/com/android/server/pm/Computer.java
index 6f619583b876e..c81e7873da602 100644
--- a/services/core/java/com/android/server/pm/Computer.java
+++ b/services/core/java/com/android/server/pm/Computer.java
@@ -612,6 +612,10 @@ public interface Computer {
     @Computer.LiveImplementation(override = LiveImplementation.MANDATORY)
     int getUidTargetSdkVersion(int uid);
 
+    /**
+     * @see PackageManagerInternal#getProcessesForUid(int)
+     */
+    @Computer.LiveImplementation(override = LiveImplementation.MANDATORY)
     @Nullable
     ArrayMap<String, ProcessInfo> getProcessesForUid(int uid);
     // End block
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java
index 734fdbaef919f..7aea392e37ec1 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerServiceTest.java
@@ -509,6 +509,11 @@ public class PackageManagerServiceTest {
         for (Method m : coreMethods) {
             if (m != null) {
                 final String name = "ComputerEngine." + displayName(m);
+                if (name.contains(".lambda$static")) {
+                    // skip static lambda function
+                    continue;
+                }
+
                 final int modifiers = m.getModifiers();
                 if (isPrivate(modifiers)) {
                     // Okay