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

Commit 9d5f5e2a 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" am: df9c0ce0 

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

Change-Id: I43c312df8751fe6af3473906cc001ccc2e566af5
parents b5cf67da df9c0ce0

core/java/android/content/pm/PackageParser.java

+3 −3
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ public class PackageParser { 
     * Automatically detects if the package is a monolithic style (single APK

     * file) or cluster style (directory of APKs).

     * <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,

     * and unique split names.

     *
@@ -1038,7 +1038,7 @@ public class PackageParser { 
     * package is a monolithic style (single APK file) or cluster style

     * (directory of APKs).

     * <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,

     * and unique split names.

     * <p>
@@ -1255,7 +1255,7 @@ public class PackageParser { 


    /**

     * 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

     * split names.

     * <p>