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

Merge "Fix PackageInfo not being queried per user" into udc-dev

Browse Source
This commit is contained in:
Eric Chiang
2023-04-19 00:39:33 +00:00
committed by Android (Google) Code Review
parent 03a4257306 d33e27f8aa
commit eddeee8179
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -3018,7 +3018,7 @@ public class AccountManagerService
final long identityToken = clearCallingIdentity();
try {
// Distill the caller's package signatures into a single digest.
final byte[] callerPkgSigDigest = calculatePackageSignatureDigest(callerPkg);
final byte[] callerPkgSigDigest = calculatePackageSignatureDigest(callerPkg, userId);
// if the caller has permission, do the peek. otherwise go the more expensive
// route of starting a Session
@@ -3182,12 +3182,12 @@ public class AccountManagerService
.write();
}
private byte[] calculatePackageSignatureDigest(String callerPkg) {
private byte[] calculatePackageSignatureDigest(String callerPkg, int userId) {
MessageDigest digester;
try {
digester = MessageDigest.getInstance("SHA-256");
PackageInfo pkgInfo = mPackageManager.getPackageInfo(
callerPkg, PackageManager.GET_SIGNATURES);
PackageInfo pkgInfo = mPackageManager.getPackageInfoAsUser(
callerPkg, PackageManager.GET_SIGNATURES, userId);
for (Signature sig : pkgInfo.signatures) {
digester.update(sig.toByteArray());
}