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

Commit da600a5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ignore parse partition order file path" into main am: a022a844 

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



Change-Id: If33534a0021710b9cf7d3d146ee14b71e36ee3f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c38363d4 a022a844

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/parsing/SystemPartitionParseTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.pm.parsing



import android.content.pm.PackageManager

import android.content.pm.parsing.ApkLiteParseUtils

import android.platform.test.annotations.Postsubmit

import com.android.internal.pm.parsing.PackageParserException

import com.android.internal.pm.pkg.parsing.ParsingPackageUtils
@@ -81,10 +82,12 @@ class SystemPartitionParseTest { 
        val exceptions = buildApks()

                .map {

                    runCatching {

                        if (ApkLiteParseUtils.isApkFile(it) || it.isDirectory()) {

                            parser.parsePackage(

                                it, ParsingPackageUtils.PARSE_IS_SYSTEM_DIR, false /*useCaches*/)

                        }

                    }

                }

                .mapNotNull { it.exceptionOrNull() }

                .filterNot { (it as? PackageParserException)?.error ==

                        PackageManager.INSTALL_PARSE_FAILED_SKIPPED }