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

Commit d1b7ec6b authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Stop recording RKP pool stats from framework" am: d6af9659 am: 94681dcf 

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



Change-Id: Ie28548a7630ac262166ecf882af1eb5a65aea838
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0815c1b 94681dcf

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

+0 −26
Original line number Original line Diff line number Diff line
@@ -147,7 +147,6 @@ import android.security.metrics.Keystore2AtomWithOverflow; 
import android.security.metrics.KeystoreAtom;

import android.security.metrics.KeystoreAtom;

import android.security.metrics.KeystoreAtomPayload;

import android.security.metrics.KeystoreAtomPayload;

import android.security.metrics.RkpErrorStats;

import android.security.metrics.RkpErrorStats;

import android.security.metrics.RkpPoolStats;

import android.security.metrics.StorageStats;

import android.security.metrics.StorageStats;

import android.stats.storage.StorageEnums;

import android.stats.storage.StorageEnums;

import android.telephony.ModemActivityInfo;

import android.telephony.ModemActivityInfo;
@@ -722,7 +721,6 @@ public class StatsPullAtomService extends SystemService { 
                            return pullInstalledIncrementalPackagesLocked(atomTag, data);

                            return pullInstalledIncrementalPackagesLocked(atomTag, data);

                        }

                        }

                    case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS:

                    case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS:

                    case FrameworkStatsLog.RKP_POOL_STATS:

                    case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO:

                    case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO:

                    case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO:

                    case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO:

                    case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO:

                    case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO:
@@ -928,7 +926,6 @@ public class StatsPullAtomService extends SystemService { 
        registerSettingsStats();

        registerSettingsStats();

        registerInstalledIncrementalPackages();

        registerInstalledIncrementalPackages();

        registerKeystoreStorageStats();

        registerKeystoreStorageStats();

        registerRkpPoolStats();

        registerKeystoreKeyCreationWithGeneralInfo();

        registerKeystoreKeyCreationWithGeneralInfo();

        registerKeystoreKeyCreationWithAuthInfo();

        registerKeystoreKeyCreationWithAuthInfo();

        registerKeystoreKeyCreationWithPurposeModesInfo();

        registerKeystoreKeyCreationWithPurposeModesInfo();
@@ -4226,14 +4223,6 @@ public class StatsPullAtomService extends SystemService { 
                mStatsCallbackImpl);

                mStatsCallbackImpl);

    }

    }





    private void registerRkpPoolStats() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.RKP_POOL_STATS,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreKeyCreationWithGeneralInfo() {

    private void registerKeystoreKeyCreationWithGeneralInfo() {

        mStatsManager.setPullAtomCallback(

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO,

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO,
@@ -4341,19 +4330,6 @@ public class StatsPullAtomService extends SystemService { 
        return StatsManager.PULL_SUCCESS;

        return StatsManager.PULL_SUCCESS;

    }

    }





    int parseRkpPoolStats(KeystoreAtom[] atoms, List<StatsEvent> pulledData) {

        for (KeystoreAtom atomWrapper : atoms) {

            if (atomWrapper.payload.getTag() != KeystoreAtomPayload.rkpPoolStats) {

                return StatsManager.PULL_SKIP;

            }

            RkpPoolStats atom = atomWrapper.payload.getRkpPoolStats();

            pulledData.add(FrameworkStatsLog.buildStatsEvent(

                    FrameworkStatsLog.RKP_POOL_STATS, atom.security_level, atom.expiring,

                    atom.unassigned, atom.attested, atom.total));

        }

        return StatsManager.PULL_SUCCESS;

    }



    int parseKeystoreKeyCreationWithGeneralInfo(KeystoreAtom[] atoms, List<StatsEvent> pulledData) {

    int parseKeystoreKeyCreationWithGeneralInfo(KeystoreAtom[] atoms, List<StatsEvent> pulledData) {

        for (KeystoreAtom atomWrapper : atoms) {

        for (KeystoreAtom atomWrapper : atoms) {

            if (atomWrapper.payload.getTag()

            if (atomWrapper.payload.getTag()
@@ -4486,8 +4462,6 @@ public class StatsPullAtomService extends SystemService { 
            switch (atomTag) {

            switch (atomTag) {

                case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS:

                case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS:

                    return parseKeystoreStorageStats(atoms, pulledData);

                    return parseKeystoreStorageStats(atoms, pulledData);

                case FrameworkStatsLog.RKP_POOL_STATS:

                    return parseRkpPoolStats(atoms, pulledData);

                case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO:

                case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO:

                    return parseKeystoreKeyCreationWithGeneralInfo(atoms, pulledData);

                    return parseKeystoreKeyCreationWithGeneralInfo(atoms, pulledData);

                case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO:

                case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: