From cf404f6474cc3d23772d2fa49a9985af254eed20 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 19 Mar 2020 15:40:36 +0000
Subject: [PATCH] Migrate service-statsd off IoUtils

There's an equivalent public method in FileUtils, so use that
one instead for now.

Note that the method is deprecated, so there may be reason to
move off it altogether.

Bug: 146757305
Test: m
Change-Id: Ia4f29a255bd02e16c1fa8be331d3e7834a2cefdc
---
 .../java/com/android/server/stats/StatsCompanionService.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
index c84627de3e366..c4f1531dfcdf9 100644
--- a/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
+++ b/apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Binder;
 import android.os.Bundle;
+import android.os.FileUtils;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
@@ -47,8 +48,6 @@ import android.util.proto.ProtoOutputStream;
 
 import com.android.internal.annotations.GuardedBy;
 
-import libcore.io.IoUtils;
-
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
@@ -226,7 +225,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
                     Log.d(TAG, "Sent data for " + numRecords + " apps");
                 }
             } finally {
-                IoUtils.closeQuietly(fout);
+                FileUtils.closeQuietly(fout);
                 backgroundThread.quit();
                 backgroundThread.interrupt();
             }