From 40e746c787b997c5c531bd59552de3efaf9176a5 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Tue, 5 Oct 2021 17:06:55 +0800
Subject: [PATCH] Remove redundant parameter (2/n)

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

Bug: 203026561
Test: m

Change-Id: Id368073187fbb7590599355cf994a3c39068c561
---
 .../android/server/pm/VerificationParams.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/core/java/com/android/server/pm/VerificationParams.java b/services/core/java/com/android/server/pm/VerificationParams.java
index 3d2ffe1b868e9..ed15e6931fead 100644
--- a/services/core/java/com/android/server/pm/VerificationParams.java
+++ b/services/core/java/com/android/server/pm/VerificationParams.java
@@ -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;