Merge "Add StorageVolume list to MountService dump" (a1b68687) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/StorageVolume.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,10 @@ public class StorageVolume implements Parcelable {

		@Override
		public String toString() {
		return mPath;
		return "StorageVolume [mAllowMassStorage=" + mAllowMassStorage + ", mDescription="
		+ mDescription + ", mEmulated=" + mEmulated + ", mMaxFileSize=" + mMaxFileSize
		+ ", mMtpReserveSpace=" + mMtpReserveSpace + ", mPath=" + mPath + ", mRemovable="
		+ mRemovable + ", mStorageId=" + mStorageId + "]";
		}

		public static final Parcelable.Creator<StorageVolume> CREATOR =

+13 −0

Original line number	Diff line number	Diff line
		@@ -2361,6 +2361,19 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC
		pw.print(" -> "); pw.println(e.getValue().toString());
		}
		}

		pw.println("");

		synchronized (mVolumes) {
		pw.println(" mVolumes:");

		final int N = mVolumes.size();
		for (int i = 0; i < N; i++) {
		final StorageVolume v = mVolumes.get(i);
		pw.print(" ");
		pw.println(v.toString());
		}
		}
		}
		}