diff options
| author | Sandeep Dhavale <dhavale@google.com> | 2023-04-11 00:06:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-04-11 00:06:18 +0000 |
| commit | 3750abf7379dea5185d4773f5eb49f27fbe7046c (patch) | |
| tree | cc5b4948882fa6f48cdb20858a5919548e9bc8ba | |
| parent | 98933d4551949af5779239d13869c70169debcc5 (diff) | |
| parent | 6c66b4578de731472dfb19c4ea4818644f453cc9 (diff) | |
| download | extras-android-u-beta-1-gpl.tar.gz | |
Merge "Add fs_type to lpdump"android-u-beta-1-gpl
| -rw-r--r-- | partition_tools/dynamic_partitions_device_info.proto | 4 | ||||
| -rw-r--r-- | partition_tools/lpdump.cc | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/partition_tools/dynamic_partitions_device_info.proto b/partition_tools/dynamic_partitions_device_info.proto index e53b40e2..8800dac7 100644 --- a/partition_tools/dynamic_partitions_device_info.proto +++ b/partition_tools/dynamic_partitions_device_info.proto @@ -25,7 +25,7 @@ message DynamicPartitionsDeviceInfoProto { bool enabled = 1; bool retrofit = 2; - // Next: 7 + // Next: 8 message Partition { string name = 1; string group_name = 2 [json_name = "group_name"]; @@ -36,6 +36,8 @@ message DynamicPartitionsDeviceInfoProto { uint64 fs_size = 5 [json_name = "fs_size"]; /** Used space of the filesystem. */ uint64 fs_used = 6 [json_name = "fs_used"]; + /** Name of the filesystem. */ + string fs_type = 7 [json_name = "fs_type"]; } repeated Partition partitions = 3; diff --git a/partition_tools/lpdump.cc b/partition_tools/lpdump.cc index 047b5ee0..97682940 100644 --- a/partition_tools/lpdump.cc +++ b/partition_tools/lpdump.cc @@ -229,6 +229,13 @@ static bool MergeFsUsage(DynamicPartitionsDeviceInfoProto* proto, partition_proto->set_is_dynamic(false); } partition_proto->set_fs_size((uint64_t)vst.f_blocks * vst.f_frsize); + + if (!entry.fs_type.empty()) { + partition_proto->set_fs_type(entry.fs_type); + } else { + partition_proto->set_fs_type("UNKNOWN"); + } + if (vst.f_bavail <= vst.f_blocks) { partition_proto->set_fs_used((uint64_t)(vst.f_blocks - vst.f_bavail) * vst.f_frsize); } |