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

Commit 2863f04c 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: f8ca4796 am: 26d3e569

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

Change-Id: I090f2b972cd5d0221da4d690d98df29f4a5b0445
parents fee90009 26d3e569

core/java/android/content/pm/dex/DexMetadataHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class DexMetadataHelper { 


    /**

     * Validate that the given file is a dex metadata archive.

     * This is just a sanity validation that the file is a zip archive.

     * This is just a validation that the file is a zip archive.

     *

     * @throws PackageParserException if the file is not a .dm file.

     */
@@ -173,7 +173,7 @@ public class DexMetadataHelper { 
     * (for any foo.dm there should be either a 'foo' of a 'foo.apk' file).

     * If that's not the case it throws {@code IllegalStateException}.

     *

     * This is used to perform a basic sanity check during adb install commands.

     * This is used to perform a basic check during adb install commands.

     * (The installer does not support stand alone .dm files)

     */

    public static void validateDexPaths(String[] paths) {