commit 55bca7e336de3758b8d971dfdda147bc9e02cde5
author Nate Myren <ntmyren@google.com> Fri Sep 01 23:09:27 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 01 23:09:27 2023 +0000
tree 5713503948d875705e1b02294b3d5ebd4e4707e8
parent 65963b92cd168687a6ce5d17ca328d4765b3a5c9
parent 670a363dc9cdbb00aef8a84a19ea9505863b9dc9

Merge "Remove token check from equalsExceptToken" into udc-qpr-dev

services/core/java/com/android/server/pm/PackageInstallerSession.java

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index d662aae..204e358 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -1365,11 +1365,13 @@
         assertCallerIsOwnerRootOrVerifier();
         synchronized (mLock) {
             assertPreparedAndNotDestroyedLocked("getNames");
+            String[] names;
             if (!isCommitted()) {
-                return getNamesLocked();
+                names = getNamesLocked();
             } else {
-                return getStageDirContentsLocked();
+                names = getStageDirContentsLocked();
             }
+            return ArrayUtils.removeString(names, APP_METADATA_FILE_NAME);
         }
     }