Merge "Migrate service-statsd off IoUtils" into rvc-dev
diff --git a/apex/service/java/com/android/server/stats/StatsCompanionService.java b/apex/service/java/com/android/server/stats/StatsCompanionService.java
index c84627d..c4f1531 100644
--- a/apex/service/java/com/android/server/stats/StatsCompanionService.java
+++ b/apex/service/java/com/android/server/stats/StatsCompanionService.java
@@ -30,6 +30,7 @@
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 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 @@
Log.d(TAG, "Sent data for " + numRecords + " apps");
}
} finally {
- IoUtils.closeQuietly(fout);
+ FileUtils.closeQuietly(fout);
backgroundThread.quit();
backgroundThread.interrupt();
}