Merge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev

2016-08-04 20:53:55 +00:00
parent 65889f7e26 28ba2898ce
commit a4b89c054c
1 changed files with 2 additions and 1 deletions
--- 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();