Fix LogAnalysis App Versions dump.oreo-dr1-dev

(cherry-picked from unsubmitted change in oc-dev ag/2549006 and updated)

Test: DumpsysPackageStatsItemTest, manual: java -classpath out/host/linux-x86/tradefed/loganalysis.jar com.android.loganalysis.LogAnalyzer --bugreport bugreport.txt
Bug: b/38415015
Change-Id: I6bce38a18441712d2f182a0d3c60b7851f87470e

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/loganalysis/item/DumpsysPackageStatsItem.java b/src/com/android/loganalysis/item/DumpsysPackageStatsItem.java
index 14c4073..b10f055 100644
--- a/src/com/android/loganalysis/item/DumpsysPackageStatsItem.java
+++ b/src/com/android/loganalysis/item/DumpsysPackageStatsItem.java
@@ -19,6 +19,8 @@ package com.android.loganalysis.item;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Map;
+
 /** An {@link IItem} used to store apps and their version codes and names. */
 public class DumpsysPackageStatsItem extends GenericMapItem<AppVersionItem> {
     private static final long serialVersionUID = 1L;
@@ -31,7 +33,11 @@ public class DumpsysPackageStatsItem extends GenericMapItem<AppVersionItem> {
     public JSONObject toJson() {
         JSONObject object = new JSONObject();
         try {
-            object.put(APP_VERSIONS, super.toJson());
+            JSONObject appVersions = new JSONObject();
+            for (Map.Entry<String, AppVersionItem> entry : entrySet()) {
+                appVersions.put(entry.getKey(), entry.getValue().toJson());
+            }
+            object.put(APP_VERSIONS, appVersions);
         } catch (JSONException e) {
             // Ignore
         }