From ea8a9cb9fe5524feaccda44cbffd8f86ef95f9e6 Mon Sep 17 00:00:00 2001
From: Felka Chang <felkachang@google.com>
Date: Sun, 23 Jan 2022 23:09:31 +0800
Subject: [PATCH] Fix PackageInfoUserFieldsTest ClassNotFoundException

In order to make parsing package APIs visible for mainline, moving
parsing classes to system server. The related test cases should
change appropriately. Test Plan should also follow the change.

Because com.android.server.pm.parsing.PackageInfoUserFieldsTest has
been removed , frameworks/base/core/java/android/os/TEST_MAPPING
contains '"include-filter":
"com.android.server.pm.parsing.PackageInfoUserFieldsTest"'
that doesn't work.

Test: atest \
 com.android.server.pm.parsing.PackageInfoUserFieldsTest;
 # It gets Class Not Found
Test: http://ab/I11400010010682351

Fixed: 215305254
Change-Id: Ib435e5d08faa663dcfd03232378998b1db6f2a0e
---
 core/java/android/os/TEST_MAPPING | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/java/android/os/TEST_MAPPING b/core/java/android/os/TEST_MAPPING
index 07f40828eb56a..22ddbccbaaaed 100644
--- a/core/java/android/os/TEST_MAPPING
+++ b/core/java/android/os/TEST_MAPPING
@@ -30,15 +30,6 @@
         }
       ]
     },
-    {
-      "file_patterns": ["Environment\\.java"],
-      "name": "FrameworksServicesTests",
-      "options": [
-        {
-          "include-filter": "com.android.server.pm.parsing.PackageInfoUserFieldsTest"
-        }
-      ]
-    },
     {
       "file_patterns": [
         "BatteryStats[^/]*\\.java",