Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: f8ca47966f am: 26d3e569db am: 2863f04c43 am: 94cdb39dbb

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

Change-Id: Ia34928d6533474ad4f000f1b3a5300a8af06fdff
This commit is contained in:
Treehugger Robot
2020-07-31 00:23:28 +00:00
committed by Automerger Merge Worker
parent c38049f901 94cdb39dbb
commit 9729aa4f7b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/dex/DexMetadataHelper.java
View File

@@ -147,7 +147,7 @@ public class DexMetadataHelper {
/** /**
* Validate that the given file is a dex metadata archive. * 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. * @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). * (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}. * 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) * (The installer does not support stand alone .dm files)
*/ */
public static void validateDexPaths(String[] paths) { public static void validateDexPaths(String[] paths) {