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

Commit c3e076ae authored by Catherine Vlasov's avatar Catherine Vlasov
Browse files

Register all Keystore atom pullers via one helper function. 

This is a pure refactor.

Bug: 406763875
Flag: EXEMPT refactor
Test: Treehugger
Change-Id: If9ff029d97444899226d6f94dc2a303b0c1203d5
parent 3cb9dadd

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

+12 −70
Original line number Original line Diff line number Diff line
@@ -1051,15 +1051,7 @@ public class StatsPullAtomService extends SystemService { 
        registerSettingsStats();

        registerSettingsStats();

        registerStorageHealth();

        registerStorageHealth();

        registerInstalledIncrementalPackages();

        registerInstalledIncrementalPackages();

        registerKeystoreStorageStats();

        registerKeystorePullers();

        registerKeystoreKeyCreationWithGeneralInfo();

        registerKeystoreKeyCreationWithAuthInfo();

        registerKeystoreKeyCreationWithPurposeModesInfo();

        registerKeystoreAtomWithOverflow();

        registerKeystoreKeyOperationWithPurposeAndModesInfo();

        registerKeystoreKeyOperationWithGeneralInfo();

        registerRkpErrorStats();

        registerKeystoreCrashStats();

        registerAccessibilityShortcutStats();

        registerAccessibilityShortcutStats();

        registerAccessibilityFloatingMenuStats();

        registerAccessibilityFloatingMenuStats();

        registerMediaCapabilitiesStats();

        registerMediaCapabilitiesStats();
@@ -4637,77 +4629,27 @@ public class StatsPullAtomService extends SystemService { 
        return StatsManager.PULL_SUCCESS;

        return StatsManager.PULL_SUCCESS;

    }

    }





    private void registerKeystoreStorageStats() {

    private void registerKeystorePullers() {

        mStatsManager.setPullAtomCallback(

        int[] atomTags = new int[] {

                FrameworkStatsLog.KEYSTORE2_STORAGE_STATS,

                FrameworkStatsLog.KEYSTORE2_STORAGE_STATS,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreKeyCreationWithGeneralInfo() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO,

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_GENERAL_INFO,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreKeyCreationWithAuthInfo() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO,

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_AUTH_INFO,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreKeyCreationWithPurposeModesInfo() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO,

                FrameworkStatsLog.KEYSTORE2_KEY_CREATION_WITH_PURPOSE_AND_MODES_INFO,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreAtomWithOverflow() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_ATOM_WITH_OVERFLOW,

                FrameworkStatsLog.KEYSTORE2_ATOM_WITH_OVERFLOW,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreKeyOperationWithPurposeAndModesInfo() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO,

                FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_PURPOSE_AND_MODES_INFO,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerKeystoreKeyOperationWithGeneralInfo() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO,

                FrameworkStatsLog.KEYSTORE2_KEY_OPERATION_WITH_GENERAL_INFO,

                null, // use default PullAtomMetadata values,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl);

    }



    private void registerRkpErrorStats() {

        mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.RKP_ERROR_STATS,

                FrameworkStatsLog.RKP_ERROR_STATS,

                null, // use default PullAtomMetadata values,

                FrameworkStatsLog.KEYSTORE2_CRASH_STATS

                DIRECT_EXECUTOR,

        };

                mStatsCallbackImpl);

    }





    private void registerKeystoreCrashStats() {

        for (int atomTag : atomTags) {

            mStatsManager.setPullAtomCallback(

            mStatsManager.setPullAtomCallback(

                FrameworkStatsLog.KEYSTORE2_CRASH_STATS,

                    atomTag,

                    null, // use default PullAtomMetadata values,

                    null, // use default PullAtomMetadata values,

                    DIRECT_EXECUTOR,

                    DIRECT_EXECUTOR,

                    mStatsCallbackImpl);

                    mStatsCallbackImpl);

        }

        }

    }





    private void registerAccessibilityShortcutStats() {

    private void registerAccessibilityShortcutStats() {

        int tagId = FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_STATS;

        int tagId = FrameworkStatsLog.ACCESSIBILITY_SHORTCUT_STATS;