From 6ff12da99794f33b23db546ed97e5a0426c00dbe Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Thu, 6 Feb 2020 17:20:19 +0800
Subject: [PATCH] Add a test API PackageManager#MODULE_APEX_NAME (2/n)

This API is used by the GTS to check mainline modules distributed as
apk-in-apex are included in the whitelist.

Bug: 148386485
Test: N/A (included in another CL)
Change-Id: I25b1c0703e3f345756a5ba91de070025042714f4
---
 api/test-current.txt                             | 1 +
 core/java/android/content/pm/PackageManager.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/test-current.txt b/api/test-current.txt
index 9472ce2569d31..75ec6581c818e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -917,6 +917,7 @@ package android.content.pm {
     field public static final int FLAG_PERMISSION_USER_SET = 1; // 0x1
     field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000
     field public static final int MATCH_KNOWN_PACKAGES = 4202496; // 0x402000
+    field public static final int MODULE_APEX_NAME = 1; // 0x1
     field public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services";
     field public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared";
   }
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 6d5e8fb0240e2..74b361b231143 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -596,6 +596,7 @@ public abstract class PackageManager {
      * @hide
      */
     @SystemApi
+    @TestApi
     public static final int MODULE_APEX_NAME = 0x00000001;
 
     /** @hide */