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

Commit b5b91ee4 authored by Sandro Montanari's avatar Sandro Montanari Committed by Automerger Merge Worker
Browse files

Merge "Add /metadata info on dumpsys diskstats and StatsPullAtomService" am:... 

Merge "Add /metadata info on dumpsys diskstats and StatsPullAtomService" am: 31f779f9 am: 079b5b2e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993550

Change-Id: Id7d21107af67a42efb74e20298417a2aa1361ec7
parents 63e490a7 079b5b2e

core/java/android/os/Environment.java

+10 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ public class Environment { 
    private static final File DIR_ANDROID_EXPAND = getDirectory(ENV_ANDROID_EXPAND, "/mnt/expand");

    private static final File DIR_ANDROID_STORAGE = getDirectory(ENV_ANDROID_STORAGE, "/storage");

    private static final File DIR_DOWNLOAD_CACHE = getDirectory(ENV_DOWNLOAD_CACHE, "/cache");

    private static final File DIR_METADATA = new File("/metadata");

    private static final File DIR_OEM_ROOT = getDirectory(ENV_OEM_ROOT, "/oem");

    private static final File DIR_ODM_ROOT = getDirectory(ENV_ODM_ROOT, "/odm");

    private static final File DIR_VENDOR_ROOT = getDirectory(ENV_VENDOR_ROOT, "/vendor");
@@ -1097,6 +1098,15 @@ public class Environment { 
        return DIR_DOWNLOAD_CACHE;

    }



    /**

     * Return the metadata directory.

     *

     * @hide

     */

    public static @NonNull File getMetadataDirectory() {

        return DIR_METADATA;

    }



    /**

     * Unknown storage state, such as when a path isn't backed by known storage

     * media.

core/proto/android/service/diskstats.proto

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ message DiskStatsFreeSpaceProto { 
        FOLDER_CACHE = 1;

        // System folder

        FOLDER_SYSTEM = 2;

        // Metadata folder

        FOLDER_METADATA = 3;

    }

    // Which folder?

    optional Folder folder = 1;

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

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ public class DiskStatsService extends Binder { 
                DiskStatsFreeSpaceProto.FOLDER_CACHE);

        reportFreeSpace(new File("/system"), "System", pw, proto,

                DiskStatsFreeSpaceProto.FOLDER_SYSTEM);

        reportFreeSpace(Environment.getMetadataDirectory(), "Metadata", pw, proto,

                DiskStatsFreeSpaceProto.FOLDER_METADATA);



        boolean fileBased = StorageManager.isFileEncryptedNativeOnly();

        boolean blockBased = fileBased ? false : StorageManager.isBlockEncrypted();

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+5 −0
Original line number Diff line number Diff line
@@ -2621,6 +2621,7 @@ public class StatsPullAtomService extends SystemService { 
        StatFs statFsData = new StatFs(Environment.getDataDirectory().getAbsolutePath());

        StatFs statFsSystem = new StatFs(Environment.getRootDirectory().getAbsolutePath());

        StatFs statFsCache = new StatFs(Environment.getDownloadCacheDirectory().getAbsolutePath());

        StatFs metadataFsSystem = new StatFs(Environment.getMetadataDirectory().getAbsolutePath());



        pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag,

                FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__DATA, statFsData.getAvailableBytes(),
@@ -2633,6 +2634,10 @@ public class StatsPullAtomService extends SystemService { 
        pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag,

                FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__SYSTEM,

                statFsSystem.getAvailableBytes(), statFsSystem.getTotalBytes()));



        pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag,

                FrameworkStatsLog.DIRECTORY_USAGE__DIRECTORY__METADATA,

                metadataFsSystem.getAvailableBytes(), metadataFsSystem.getTotalBytes()));

        return StatsManager.PULL_SUCCESS;

    }