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

Commit daaeeafd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "tej-native-feedback" into rvc-dev am: e6ecb06d am: 92fd3e57 

Change-Id: I17f4584c26eb7ed9e80a53f2a1f1553f98f3d27d
parents 0197146e 92fd3e57

libstats/pull/include/stats_pull_atom_callback.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ void AStatsManager_PullAtomMetadata_setAdditiveFields(AStatsManager_PullAtomMeta 
                                                      int32_t* additive_fields, int32_t num_fields);

                                                      int32_t* additive_fields, int32_t num_fields);





/**

/**

 * Get the number the additive fields of this pulled atom. This is intended to be called before

 * Get the number of additive fields for this pulled atom. This is intended to be called before

 * AStatsManager_PullAtomMetadata_getAdditiveFields to determine the size of the array.

 * AStatsManager_PullAtomMetadata_getAdditiveFields to determine the size of the array.

 */

 */

int32_t AStatsManager_PullAtomMetadata_getNumAdditiveFields(

int32_t AStatsManager_PullAtomMetadata_getNumAdditiveFields(

libstats/pull/stats_pull_atom_callback.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,6 @@ int32_t AStatsManager_PullAtomMetadata_getNumAdditiveFields( 
void AStatsManager_PullAtomMetadata_getAdditiveFields(AStatsManager_PullAtomMetadata* metadata,

void AStatsManager_PullAtomMetadata_getAdditiveFields(AStatsManager_PullAtomMetadata* metadata,

                                                      int32_t* fields) {

                                                      int32_t* fields) {

    std::copy(metadata->additive_fields.begin(), metadata->additive_fields.end(), fields);

    std::copy(metadata->additive_fields.begin(), metadata->additive_fields.end(), fields);

    return;

}

}





class StatsPullAtomCallbackInternal : public BnPullAtomCallback {

class StatsPullAtomCallbackInternal : public BnPullAtomCallback {