Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 919c961d authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Migrate service-statsd off IoUtils" into rvc-dev am: 037d723a 

Change-Id: If4eaa6f19261f4b9aaea6555608a6c98de3d128f
parents e5d9f05f 037d723a

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+2 −3
Original line number Diff line number Diff line
@@ -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();

            }