Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7d2f0e8 authored by Kweku Adams's avatar Kweku Adams
Browse files

Adding size suffix to diskstats fields. 

This is to follow the stated style convention.

Bug: 74975371
Test: flash device and check incident output
Change-Id: Ic4282f2e623999f4d7795c4932d5faf10280c3c6
parent d9d45fd7

core/proto/android/service/diskstats.proto

+14 −14
Original line number Diff line number Diff line
@@ -55,25 +55,25 @@ message DiskStatsCachedValuesProto { 
    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // Total app code size, in kilobytes

    optional int64 agg_apps_size = 1;

    optional int64 agg_apps_size_kb = 1;

    // Total app cache size, in kilobytes

    optional int64 agg_apps_cache_size = 2;

    optional int64 agg_apps_cache_size_kb = 2;

    // Size of image files, in kilobytes

    optional int64 photos_size = 3;

    optional int64 photos_size_kb = 3;

    // Size of video files, in kilobytes

    optional int64 videos_size = 4;

    optional int64 videos_size_kb = 4;

    // Size of audio files, in kilobytes

    optional int64 audio_size = 5;

    optional int64 audio_size_kb = 5;

    // Size of downloads, in kilobytes

    optional int64 downloads_size = 6;

    optional int64 downloads_size_kb = 6;

    // Size of system directory, in kilobytes

    optional int64 system_size = 7;

    optional int64 system_size_kb = 7;

    // Size of other files, in kilobytes

    optional int64 other_size = 8;

    optional int64 other_size_kb = 8;

    // Sizes of individual packages

    repeated DiskStatsAppSizesProto app_sizes = 9;

    // Total app data size, in kilobytes

    optional int64 agg_apps_data_size = 10;

    optional int64 agg_apps_data_size_kb = 10;

}



message DiskStatsAppSizesProto {
@@ -82,11 +82,11 @@ message DiskStatsAppSizesProto { 
    // Name of the package

    optional string package_name = 1;

    // App's code size in kilobytes

    optional int64 app_size = 2;

    optional int64 app_size_kb = 2;

    // App's cache size in kilobytes

    optional int64 cache_size = 3;

    optional int64 cache_size_kb = 3;

    // App's data size in kilobytes

    optional int64 app_data_size = 4;

    optional int64 app_data_size_kb = 4;

}



message DiskStatsFreeSpaceProto {
@@ -103,7 +103,7 @@ message DiskStatsFreeSpaceProto { 
    // Which folder?

    optional Folder folder = 1;

    // Available space, in kilobytes

    optional int64 available_space = 2;

    optional int64 available_space_kb = 2;

    // Total space, in kilobytes

    optional int64 total_space = 3;

    optional int64 total_space_kb = 3;

}

services/core/java/com/android/server/DiskStatsService.java

+14 −14
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ public class DiskStatsService extends Binder { 
            if (proto != null) {

                long freeSpaceToken = proto.start(DiskStatsServiceDumpProto.PARTITIONS_FREE_SPACE);

                proto.write(DiskStatsFreeSpaceProto.FOLDER, folderType);

                proto.write(DiskStatsFreeSpaceProto.AVAILABLE_SPACE, avail * bsize / 1024);

                proto.write(DiskStatsFreeSpaceProto.TOTAL_SPACE, total * bsize / 1024);

                proto.write(DiskStatsFreeSpaceProto.AVAILABLE_SPACE_KB, avail * bsize / 1024);

                proto.write(DiskStatsFreeSpaceProto.TOTAL_SPACE_KB, total * bsize / 1024);

                proto.end(freeSpaceToken);

            } else {

                pw.print(name);
@@ -247,23 +247,23 @@ public class DiskStatsService extends Binder { 
            JSONObject json = new JSONObject(jsonString);

            long cachedValuesToken = proto.start(DiskStatsServiceDumpProto.CACHED_FOLDER_SIZES);



            proto.write(DiskStatsCachedValuesProto.AGG_APPS_SIZE,

            proto.write(DiskStatsCachedValuesProto.AGG_APPS_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.APP_SIZE_AGG_KEY));

            proto.write(DiskStatsCachedValuesProto.AGG_APPS_DATA_SIZE,

            proto.write(DiskStatsCachedValuesProto.AGG_APPS_DATA_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.APP_DATA_SIZE_AGG_KEY));

            proto.write(DiskStatsCachedValuesProto.AGG_APPS_CACHE_SIZE,

            proto.write(DiskStatsCachedValuesProto.AGG_APPS_CACHE_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.APP_CACHE_AGG_KEY));

            proto.write(DiskStatsCachedValuesProto.PHOTOS_SIZE,

            proto.write(DiskStatsCachedValuesProto.PHOTOS_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.PHOTOS_KEY));

            proto.write(DiskStatsCachedValuesProto.VIDEOS_SIZE,

            proto.write(DiskStatsCachedValuesProto.VIDEOS_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.VIDEOS_KEY));

            proto.write(DiskStatsCachedValuesProto.AUDIO_SIZE,

            proto.write(DiskStatsCachedValuesProto.AUDIO_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.AUDIO_KEY));

            proto.write(DiskStatsCachedValuesProto.DOWNLOADS_SIZE,

            proto.write(DiskStatsCachedValuesProto.DOWNLOADS_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.DOWNLOADS_KEY));

            proto.write(DiskStatsCachedValuesProto.SYSTEM_SIZE,

            proto.write(DiskStatsCachedValuesProto.SYSTEM_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.SYSTEM_KEY));

            proto.write(DiskStatsCachedValuesProto.OTHER_SIZE,

            proto.write(DiskStatsCachedValuesProto.OTHER_SIZE_KB,

                    json.getLong(DiskStatsFileLogger.MISC_KEY));



            JSONArray packageNamesArray = json.getJSONArray(DiskStatsFileLogger.PACKAGE_NAMES_KEY);
@@ -279,9 +279,9 @@ public class DiskStatsService extends Binder { 


                    proto.write(DiskStatsAppSizesProto.PACKAGE_NAME,

                            packageNamesArray.getString(i));

                    proto.write(DiskStatsAppSizesProto.APP_SIZE, appSizesArray.getLong(i));

                    proto.write(DiskStatsAppSizesProto.APP_DATA_SIZE, appDataSizesArray.getLong(i));

                    proto.write(DiskStatsAppSizesProto.CACHE_SIZE, cacheSizesArray.getLong(i));

                    proto.write(DiskStatsAppSizesProto.APP_SIZE_KB, appSizesArray.getLong(i));

                    proto.write(DiskStatsAppSizesProto.APP_DATA_SIZE_KB, appDataSizesArray.getLong(i));

                    proto.write(DiskStatsAppSizesProto.CACHE_SIZE_KB, cacheSizesArray.getLong(i));



                    proto.end(packageToken);

                }