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

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

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: df9c0ce0 am: 9d5f5e2a am: 0cc93e30 am: 5b3c38fa am: c0e359ff

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

Change-Id: I533aec13284eb989d516fc77c14cf38ab3a7027d
parents cc817619 c0e359ff
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -917,7 +917,7 @@ public class PackageParser {
     * Automatically detects if the package is a monolithic style (single APK
     * Automatically detects if the package is a monolithic style (single APK
     * file) or cluster style (directory of APKs).
     * file) or cluster style (directory of APKs).
     * <p>
     * <p>
     * This performs sanity checking on cluster style packages, such as
     * This performs checking on cluster style packages, such as
     * requiring identical package name and version codes, a single base APK,
     * requiring identical package name and version codes, a single base APK,
     * and unique split names.
     * and unique split names.
     *
     *
@@ -1038,7 +1038,7 @@ public class PackageParser {
     * package is a monolithic style (single APK file) or cluster style
     * package is a monolithic style (single APK file) or cluster style
     * (directory of APKs).
     * (directory of APKs).
     * <p>
     * <p>
     * This performs sanity checking on cluster style packages, such as
     * This performs checking on cluster style packages, such as
     * requiring identical package name and version codes, a single base APK,
     * requiring identical package name and version codes, a single base APK,
     * and unique split names.
     * and unique split names.
     * <p>
     * <p>
@@ -1072,7 +1072,7 @@ public class PackageParser {


    /**
    /**
     * Parse all APKs contained in the given directory, treating them as a
     * Parse all APKs contained in the given directory, treating them as a
     * single package. This also performs sanity checking, such as requiring
     * single package. This also performs checking, such as requiring
     * identical package name and version codes, a single base APK, and unique
     * identical package name and version codes, a single base APK, and unique
     * split names.
     * split names.
     * <p>
     * <p>