From 28ba2898ce335887d8fe76951c363ff9385648d0 Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Wed, 3 Aug 2016 13:50:37 -0700
Subject: [PATCH] Correctly handle a case when there are no preloaded apps

Bug: 30415696
Change-Id: Ia1cff342ff7000da3fba580083116441f478491e
---
 .../java/com/android/server/retaildemo/PreloadAppsInstaller.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
index 7a3b461a6ff7..daaa4f5c6848 100644
--- a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
@@ -67,10 +67,11 @@ class PreloadAppsInstaller {
 
     void installApps(int userId) {
         File[] files = preloadsAppsDirectory.listFiles();
+        AppInstallCounter counter = new AppInstallCounter(mContext, userId);
         if (ArrayUtils.isEmpty(files)) {
+            counter.setExpectedAppsCount(0);
             return;
         }
-        AppInstallCounter counter = new AppInstallCounter(mContext, userId);
         int expectedCount = 0;
         for (File file : files) {
             String apkName = file.getName();
-- 
2.11.0