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

Merge "Close heap dump ParcelFileDescriptor." into rvc-dev am: 48f0527199 am: a3fa90982f

Browse Source 
Change-Id: I06b252b78d2a5391583dbaa2554c2dd3d5c50330
This commit is contained in:
TreeHugger Robot
2020-04-28 21:33:52 +00:00
committed by Automerger Merge Worker
parent 667314fd8a a3fa90982f
commit e492fa7501
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityThread.java
View File

@@ -1170,6 +1170,8 @@ public final class ActivityThread extends ClientTransactionHandler {
} catch (IOException e) { } catch (IOException e) {
Slog.e(TAG, "Failed to duplicate heap dump file descriptor", e); Slog.e(TAG, "Failed to duplicate heap dump file descriptor", e);
return; return;
} finally {
IoUtils.closeQuietly(fd);
} }
dhd.finishCallback = finishCallback; dhd.finishCallback = finishCallback;
sendMessage(H.DUMP_HEAP, dhd, 0, 0, true /*async*/); sendMessage(H.DUMP_HEAP, dhd, 0, 0, true /*async*/);