diff options
| -rw-r--r-- | services/core/java/com/android/server/stats/pull/StatsPullAtomService.java | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index b4b8cf9a9eab..3d8b2931d2ec 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -147,7 +147,6 @@ import android.security.metrics.Keystore2AtomWithOverflow; import android.security.metrics.KeystoreAtom; import android.security.metrics.KeystoreAtomPayload; import android.security.metrics.RkpErrorStats; -import android.security.metrics.RkpPoolStats; import android.security.metrics.StorageStats; import android.stats.storage.StorageEnums; import android.telephony.ModemActivityInfo; @@ -714,7 +713,6 @@ public class StatsPullAtomService extends SystemService { return pullInstalledIncrementalPackagesLocked(atomTag, data); } case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS: - case FrameworkStatsLog.RKP_POOL_STATS: case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO: case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO: @@ -918,7 +916,6 @@ public class StatsPullAtomService extends SystemService { registerSettingsStats(); registerInstalledIncrementalPackages(); registerKeystoreStorageStats(); - registerRkpPoolStats(); registerKeystoreKeyCreationWithGeneralInfo(); registerKeystoreKeyCreationWithAuthInfo(); registerKeystoreKeyCreationWithPurposeModesInfo(); @@ -4137,14 +4134,6 @@ public class StatsPullAtomService extends SystemService { mStatsCallbackImpl); } - private void registerRkpPoolStats() { - mStatsManager.setPullAtomCallback( - FrameworkStatsLog.RKP_POOL_STATS, - null, // use default PullAtomMetadata values, - DIRECT_EXECUTOR, - mStatsCallbackImpl); - } - private void registerKeystoreKeyCreationWithGeneralInfo() { mStatsManager.setPullAtomCallback( FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO, @@ -4252,19 +4241,6 @@ public class StatsPullAtomService extends SystemService { 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) { for (KeystoreAtom atomWrapper : atoms) { if (atomWrapper.payload.getTag() @@ -4397,8 +4373,6 @@ public class StatsPullAtomService extends SystemService { switch (atomTag) { case FrameworkStatsLog.KEYSTORE2_STORAGE_STATS: return parseKeystoreStorageStats(atoms, pulledData); - case FrameworkStatsLog.RKP_POOL_STATS: - return parseRkpPoolStats(atoms, pulledData); case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO: return parseKeystoreKeyCreationWithGeneralInfo(atoms, pulledData); case FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO: |