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

Merge "Dump no. of open fds correctly." into rvc-dev am: b63e5b27a0 am: 6f97394207 am: 494bcd9ddf

Browse Source 
Change-Id: I28d07b54f9065f78ec5a08cd195fe71870d089fa
This commit is contained in:
Sudheer Shanka
2020-03-19 20:19:24 +00:00
committed by Automerger Merge Worker
parent 8c51e5d82a 494bcd9ddf
commit fc20301cbf
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java
View File

@@ -346,6 +346,9 @@ class BlobMetadata {
mRevocableFds.get(callingPackage); mRevocableFds.get(callingPackage);
if (revocableFdsForPkg != null) { if (revocableFdsForPkg != null) {
revocableFdsForPkg.remove(revocableFd); revocableFdsForPkg.remove(revocableFd);
if (revocableFdsForPkg.isEmpty()) {
mRevocableFds.remove(callingPackage);
}
} }
} }
}); });
@@ -360,27 +363,47 @@ class BlobMetadata {
fout.println("Committers:"); fout.println("Committers:");
fout.increaseIndent(); fout.increaseIndent();
for (int i = 0, count = mCommitters.size(); i < count; ++i) { if (mCommitters.isEmpty()) {
final Committer committer = mCommitters.valueAt(i); fout.println("<empty>");
fout.println("committer " + committer.toString()); } else {
fout.increaseIndent(); for (int i = 0, count = mCommitters.size(); i < count; ++i) {
committer.dump(fout); final Committer committer = mCommitters.valueAt(i);
fout.decreaseIndent(); fout.println("committer " + committer.toString());
fout.increaseIndent();
committer.dump(fout);
fout.decreaseIndent();
}
} }
fout.decreaseIndent(); fout.decreaseIndent();
fout.println("Leasees:"); fout.println("Leasees:");
fout.increaseIndent(); fout.increaseIndent();
for (int i = 0, count = mLeasees.size(); i < count; ++i) { if (mLeasees.isEmpty()) {
final Leasee leasee = mLeasees.valueAt(i); fout.println("<empty>");
fout.println("leasee " + leasee.toString()); } else {
fout.increaseIndent(); for (int i = 0, count = mLeasees.size(); i < count; ++i) {
leasee.dump(mContext, fout); final Leasee leasee = mLeasees.valueAt(i);
fout.decreaseIndent(); fout.println("leasee " + leasee.toString());
fout.increaseIndent();
leasee.dump(mContext, fout);
fout.decreaseIndent();
}
} }
fout.decreaseIndent(); fout.decreaseIndent();
fout.println("Open fds: #" + mRevocableFds.size()); fout.println("Open fds:");
fout.increaseIndent();
if (mRevocableFds.isEmpty()) {
fout.println("<empty>");
} else {
for (int i = 0, count = mRevocableFds.size(); i < count; ++i) {
final String packageName = mRevocableFds.keyAt(i);
final ArraySet<RevocableFileDescriptor> packageFds =
mRevocableFds.valueAt(i);
fout.println(packageName + "#" + packageFds.size());
}
}
fout.decreaseIndent();
} }
void writeToXml(XmlSerializer out) throws IOException { void writeToXml(XmlSerializer out) throws IOException {