diff options
| author | Adrian Roos <roosa@google.com> | 2022-12-05 22:24:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-05 22:24:54 +0000 |
| commit | d4be1f10b831f4c3774091c74e4b904ec6450c9a (patch) | |
| tree | 0baa92251e9c2c2d2522d953021138893ae84133 /java/com/google/turbine/processing/TurbineFiler.java | |
| parent | dd13ebbd71cedf4a82982319689ec25b0009f77f (diff) | |
| parent | 210c7d017424c9cf50cdb5fda52ca31febc92a13 (diff) | |
| download | turbine-d4be1f10b831f4c3774091c74e4b904ec6450c9a.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into aosp/master am: 1317f29ad0 am: 8742e9d19f am: 210c7d0174android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/turbine/+/2327873
Change-Id: I6dec4d2861f797e01e4f2fa71e0b001740c03849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/com/google/turbine/processing/TurbineFiler.java')
| -rw-r--r-- | java/com/google/turbine/processing/TurbineFiler.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/google/turbine/processing/TurbineFiler.java b/java/com/google/turbine/processing/TurbineFiler.java index f440ada..8c522ba 100644 --- a/java/com/google/turbine/processing/TurbineFiler.java +++ b/java/com/google/turbine/processing/TurbineFiler.java @@ -24,7 +24,6 @@ import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; -import com.google.common.io.ByteStreams; import com.google.turbine.diag.SourceFile; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -380,7 +379,7 @@ public class TurbineFiler implements Filer { @Override public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { - return new String(ByteStreams.toByteArray(openInputStream()), UTF_8); + return new String(openInputStream().readAllBytes(), UTF_8); } } |