Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ifd06da7960707fb386a032ad799439c26e7073b1
This commit is contained in:
Anton Hansson
2020-03-20 10:02:56 +00:00
committed by Automerger Merge Worker
parent 03cf95f569 037d723a02
commit 247ff0cd15
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java
View File

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