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: df9c0ce0d6 am: 9d5f5e2a5e am: 0cc93e30c4 am: 5b3c38fa33

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

Change-Id: I75eeaaa6b5a5f6a68d64fbbb63f8be2240be4081
This commit is contained in:
Treehugger Robot
2020-07-31 00:23:05 +00:00
committed by Automerger Merge Worker
parent ac9b44031d 5b3c38fa33
commit c0e359ff2c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/pm/PackageParser.java
View File

@@ -912,7 +912,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.
* *
@@ -1033,7 +1033,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>
@@ -1067,7 +1067,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>