Merge "Hold reference to and close both ends of PFD" am: eabcb6ff5e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2429197

Change-Id: I4a05e4767f60370bee82dcbc810c04984eeda26e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/service/java/com/android/server/stats/StatsCompanionService.java b/service/java/com/android/server/stats/StatsCompanionService.java
index 76bd0dff..c3771df9 100644
--- a/service/java/com/android/server/stats/StatsCompanionService.java
+++ b/service/java/com/android/server/stats/StatsCompanionService.java
@@ -207,6 +207,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
         backgroundThread.start();
         Handler handler = new Handler(backgroundThread.getLooper());
         handler.post(() -> {
+            if (DEBUG) Log.d(TAG, "Start thread for sending uid map data.");
             UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
             PackageManager pm = context.getPackageManager();
             final List<UserHandle> users = um.getUserHandles(true);
@@ -227,8 +228,7 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
             } catch (IOException e) {
                 Log.e(TAG, "Failed to close the read side of the pipe.", e);
             }
-            final ParcelFileDescriptor writeFd = fds[1];
-            FileOutputStream fout = new ParcelFileDescriptor.AutoCloseOutputStream(writeFd);
+            FileOutputStream fout = new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]);
             try {
                 ProtoOutputStream output = new ProtoOutputStream(fout);
                 int numRecords = 0;
@@ -283,9 +283,8 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
                     Log.d(TAG, "Sent data for " + numRecords + " apps");
                 }
             } finally {
-                FileUtils.closeQuietly(fout);
+                if (DEBUG) Log.d(TAG, "End thread for sending uid map data.");
                 backgroundThread.quit();
-                backgroundThread.interrupt();
             }
         });
     }