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

Remove redundant parameter (2/n)

Browse Source 
No need to pass currentStatus which always equals child.mRet inside
trySendVerificationCompleteNotification().

Bug: 203026561
Test: m

Change-Id: Id368073187fbb7590599355cf994a3c39068c561
This commit is contained in:
JW Wang
2021-10-05 17:06:55 +08:00
parent 04bdf998e4
commit 40e746c787
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/VerificationParams.java
View File

@@ -65,7 +65,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.DeviceConfig;
import android.provider.Settings;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Pair;
import android.util.Slog;
@@ -78,7 +78,7 @@ import java.security.cert.CertificateException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
final class VerificationParams extends HandlerParams {
/**
@@ -688,7 +688,7 @@ final class VerificationParams extends HandlerParams {
private void sendVerificationCompleteNotification() {
if (mParentVerificationParams != null) {
mParentVerificationParams.trySendVerificationCompleteNotification(this, mRet);
mParentVerificationParams.trySendVerificationCompleteNotification(this);
} else {
try {
mObserver.onPackageInstalled(null, mRet, mErrorMessage,
@@ -717,7 +717,7 @@ final class VerificationParams extends HandlerParams {
static final class MultiPackageVerificationParams extends HandlerParams {
private final IPackageInstallObserver2 mObserver;
private final List<VerificationParams> mChildParams;
private final Map<VerificationParams, Integer> mVerificationState;
private final Set<VerificationParams> mVerificationState;
MultiPackageVerificationParams(VerificationParams parent, List<VerificationParams> children,
PackageManagerService pm) throws PackageManagerException {
@@ -731,7 +731,7 @@ final class VerificationParams extends HandlerParams {
final VerificationParams childParams = children.get(i);
childParams.mParentVerificationParams = this;
}
mVerificationState = new ArrayMap<>(mChildParams.size());
mVerificationState = new ArraySet<>(mChildParams.size());
mObserver = parent.mObserver;
}
@@ -749,14 +749,14 @@ final class VerificationParams extends HandlerParams {
}
}
void trySendVerificationCompleteNotification(VerificationParams child, int currentStatus) {
mVerificationState.put(child, currentStatus);
void trySendVerificationCompleteNotification(VerificationParams child) {
mVerificationState.add(child);
if (mVerificationState.size() != mChildParams.size()) {
return;
}
int completeStatus = PackageManager.INSTALL_SUCCEEDED;
String errorMsg = null;
for (VerificationParams params : mVerificationState.keySet()) {
for (VerificationParams params : mVerificationState) {
int status = params.mRet;
if (status == PackageManager.INSTALL_UNKNOWN) {
return;