From e1b8d8fcd1beea70c74d8b89e72b14a516bf3faa Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Wed, 8 Jul 2020 17:43:41 -0700
Subject: [PATCH] Avoid null plugins, so we never have to special case it

Fixes: 159842083
Test: Built
Change-Id: Ic2c8fbb8cfc93c81c692d7ec22fe77bcc1fe9964
---
 .../recommendation/RecommendationServiceImpl.java            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
index 9ae31989eeb2b..5a756fe50209a 100644
--- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
+++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java
@@ -46,7 +46,7 @@ public class RecommendationServiceImpl extends RecommendationService
     private static final String LOG_TAG = "PrintServiceRecService";
 
     /** All registered plugins */
-    private ArrayList<RemotePrintServicePlugin> mPlugins;
+    private final ArrayList<RemotePrintServicePlugin> mPlugins = new ArrayList<>();
 
     /** Lock to keep multi-cast enabled */
     private WifiManager.MulticastLock mMultiCastLock;
@@ -62,8 +62,6 @@ public class RecommendationServiceImpl extends RecommendationService
             mMultiCastLock.acquire();
         }
 
-        mPlugins = new ArrayList<>();
-
         try {
             for (VendorConfig config : VendorConfig.getAllConfigs(this)) {
                 try {
@@ -138,6 +136,7 @@ public class RecommendationServiceImpl extends RecommendationService
                 Log.e(LOG_TAG, "Could not stop plugin", e);
             }
         }
+        mPlugins.clear();
 
         if (mMultiCastLock != null) {
             mMultiCastLock.release();