commit e8ae9017f5dfae18d7c4fb0b094715e894129cd4
author Bernie Thompson <bhthompson@google.com> Tue Nov 13 17:34:15 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 13 17:34:15 2018 -0800
tree a2b7d5b5dfd0adc56979c2d77ec29810c0f2acf1
parent 920eecd233f494c9e0ecc5ae86665c1f95d664e1
parent e62f8d54ab640a6588e043619e25c4c68a46250e

Merge "Flush json writer when collecitng extended device info." into nougat-mr1-cts-dev
am: e62f8d54ab

Change-Id: Id6a6bf1e7acdcd075adeb4be24b0b5ef2cfa4dca

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..0a02d25 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();
     }