commit d69e5ed30d65f7da826b4547abb49b593675bb66
author nickrose <nickrose@google.com> Fri Nov 17 23:03:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 17 23:03:32 2017 +0000
tree da6033326e148479045c6821881c96729e6cb99d
parent 47b79b22b86a1187bf7d24e9d1a56d6694599445
parent bd2521ee271362cccc92e26c6aec880a13f97712

Merge "Flush json writer when collecitng extended device info." into oc-mr1-dev
am: bd2521ee27

Change-Id: I12ef6a6de9cafe5fed478d4074e1e399bbdf3b70

common/device-side/util/src/com/android/compatibility/common/util/DeviceInfoStore.java

diff --git a/common/device-side/util/src/com/android/compatibility/common/util/DeviceInfoStore.java b/common/device-side/util/src/com/android/compatibility/common/util/DeviceInfoStore.java
index 735b955..966ac1a 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/DeviceInfoStore.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/DeviceInfoStore.java
@@ -56,6 +56,7 @@
     @Override
     public void close() throws IOException {
         mJsonWriter.endObject();
+        mJsonWriter.flush();
         mJsonWriter.close();
     }
 

common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java

diff --git a/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java b/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
index 3b7f6c8..1fa149f 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
@@ -55,6 +55,7 @@
     @Override
     public void close() throws IOException {
         mJsonWriter.endObject();
+	mJsonWriter.flush();
         mJsonWriter.close();
     }