From 4f4780f023ff864209aac64540934ea663895263 Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Mon, 15 Aug 2016 15:29:47 -0700
Subject: [PATCH] Count failed install as finished

Otherwise DEMO_USER_SETUP_COMPLETE will not be set.

Bug: 30445353
Change-Id: Id2a0c1b1643dd9846328a20f4c67e11e69b3bc84
---
 .../java/com/android/server/retaildemo/PreloadAppsInstaller.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
index daaa4f5c6848..2038c9e35f0c 100644
--- a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java
@@ -136,6 +136,10 @@ class PreloadAppsInstaller {
                         mApkToPackageMap.put(apkName, basePackageName);
                     }
                     installExistingPackage(basePackageName, userId, counter);
+                } else {
+                    Log.e(TAG, "Package " + basePackageName + " cannot be installed from "
+                            + apkName + ": " + msg + " (returnCode " + returnCode + ")");
+                    counter.appInstallFinished();
                 }
             }
         }.getBinder(), 0, SYSTEM_SERVER_PACKAGE_NAME, userId);
-- 
2.11.0