Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f794f49b authored by William Loh's avatar William Loh Committed by Automerger Merge Worker
Browse files

Merge "Filter AppMetadata file from Session.getNames" into udc-qpr-dev am: 65963b92 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555318



Change-Id: I56e2f807cfdba6f4477f3f7deddfe389b558252c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff93b9e8 65963b92

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

+4 −2
Original line number Diff line number Diff line
@@ -1365,11 +1365,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        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);

        }

    }