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

Fix <overlay-config-signature> comments

Browse Source 
Fix comments that refer to <overlay-config-signature> as
<config-signature>.

Bug: none
Test: build
Change-Id: I1d3e5e66ec3da993082f3441997b0d243d61520b
This commit is contained in:
Ryan Mitchell
2020-10-14 14:19:51 -07:00
parent 7d0ccc133b
commit 70e02d4285
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/idmap2/libidmap2/ResourceMapping.cpp
View File

@@ -71,9 +71,9 @@ Result<Unit> CheckOverlayable(const LoadedPackage& target_package,
if (!target_package.DefinesOverlayable()) {
return (sDefaultPolicies & fulfilled_policies) != 0
? Result<Unit>({})
: Error(
"overlay must be preinstalled or signed with the same signature as the "
"target");
: Error("overlay must be preinstalled, signed with the same signature as the target,"
" or signed with the same signature as the package referenced through"
" <overlay-config-signature>.");
}
const OverlayableInfo* overlayable_info = target_package.GetOverlayableInfo(target_resource);

2
core/java/com/android/server/SystemConfig.java
View File

@@ -243,7 +243,7 @@ public class SystemConfig {
// partition that is used to verify if an overlay package fulfills
// the 'config_signature' policy by comparing their signatures:
// if the overlay package is signed with the same certificate as
// the package declared in 'config-signature' tag, then the
// the package declared in 'overlay-config-signature' tag, then the
// overlay package fulfills the 'config_signature' policy.
private String mOverlayConfigSignaturePackage;

4
services/core/java/com/android/server/om/IdmapManager.java
View File

@@ -57,7 +57,7 @@ final class IdmapManager {
private final PackageManagerHelper mPackageManager;
/**
* Package name of the reference package defined in 'config-signature' tag of
* Package name of the reference package defined in 'overlay-config-signature' tag of
* SystemConfig or empty String if tag not defined. This package is vetted on scan by
* PackageManagerService that it's a system package and is used to check if overlay matches
* its signature in order to fulfill the config_signature policy.
@@ -159,7 +159,7 @@ final class IdmapManager {
fulfilledPolicies |= OverlayablePolicy.ACTOR_SIGNATURE;
}
// If SystemConfig defines 'config-signature' package, given that
// If SystemConfig defines 'overlay-config-signature' package, given that
// this package is vetted by OverlayManagerService that it's a
// preinstalled package, check if overlay matches its signature.
if (!TextUtils.isEmpty(mConfigSignaturePackage)

7
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -12161,9 +12161,10 @@ public class PackageManagerService extends IPackageManager.Stub
// A non-preloaded overlay package, without <overlay android:targetName>, will
// only be used if it is signed with the same certificate as its target OR if
// it is signed with the same certificate as a reference package declared
// in 'config-signature' tag of SystemConfig.
// If the target is already installed or 'config-signature' tag in SystemConfig
// is set, check this here to augment the last line of defence which is OMS.
// in 'overlay-config-signature' tag of SystemConfig.
// If the target is already installed or 'overlay-config-signature' tag in
// SystemConfig is set, check this here to augment the last line of defense
// which is OMS.
if (pkg.getOverlayTargetName() == null) {
final PackageSetting targetPkgSetting =
mSettings.getPackageLPr(pkg.getOverlayTarget());