diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2018-11-14 01:34:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-14 01:34:24 +0000 |
| commit | fcca1187042e343c1861bb91ff60b7b90e3f0bba (patch) | |
| tree | a2b7d5b5dfd0adc56979c2d77ec29810c0f2acf1 | |
| parent | 920eecd233f494c9e0ecc5ae86665c1f95d664e1 (diff) | |
| parent | e8ae9017f5dfae18d7c4fb0b094715e894129cd4 (diff) | |
| download | platform_cts-fcca1187042e343c1861bb91ff60b7b90e3f0bba.tar.gz platform_cts-fcca1187042e343c1861bb91ff60b7b90e3f0bba.tar.bz2 platform_cts-fcca1187042e343c1861bb91ff60b7b90e3f0bba.zip | |
Merge "Merge "Flush json writer when collecitng extended device info." into nougat-mr1-cts-dev am: e62f8d54ab" into oreo-cts-dev
| -rw-r--r-- | common/device-side/util/src/com/android/compatibility/common/util/DeviceInfoStore.java | 1 | ||||
| -rw-r--r-- | common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java | 1 |
2 files changed, 2 insertions, 0 deletions
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 735b955b842..966ac1ac909 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 @@ public class DeviceInfoStore extends InfoStore { @Override public void close() throws IOException { mJsonWriter.endObject(); + mJsonWriter.flush(); mJsonWriter.close(); } 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 3b7f6c85f73..0a02d251d00 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 @@ public class HostInfoStore extends InfoStore { @Override public void close() throws IOException { mJsonWriter.endObject(); + mJsonWriter.flush(); mJsonWriter.close(); } |