1481fe142d
Previously, pulled data was returned as a string. We instead return the data as an array of StatsLogEventWrapper, which encodes using the binary-encoded format liblog uses. StatsD uses the same parsing as for pushed events to convert these. This CL also fixes the parsing of log_msg since the strings were previously emptied before we had a chance to read the values. Note that the cpp-aidl can't support List of Parcelable, so we have to return the results as an array. Test: Manual using the new command in StatsService to print results. Also created a new unit-test by creating a dummy pull code of -1, but this test is deleted since it required creating a fake output in StatsCompanionService. Change-Id: I1cfb9ea081a59292a60e934e8527adc40982ed80
48 lines
1.4 KiB
C++
48 lines
1.4 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#ifndef STATS_LOG_EVENT_WRAPPER_H
|
|
#define STATS_LOG_EVENT_WRAPPER_H
|
|
|
|
#include <binder/Parcel.h>
|
|
#include <binder/Parcelable.h>
|
|
#include <binder/Status.h>
|
|
#include <utils/RefBase.h>
|
|
#include <vector>
|
|
|
|
namespace android {
|
|
namespace os {
|
|
|
|
// Represents a parcelable object. Only used to send data from Android OS to statsd.
|
|
class StatsLogEventWrapper : public android::Parcelable {
|
|
public:
|
|
StatsLogEventWrapper();
|
|
|
|
StatsLogEventWrapper(StatsLogEventWrapper&& in) = default;
|
|
|
|
android::status_t writeToParcel(android::Parcel* out) const;
|
|
|
|
android::status_t readFromParcel(const android::Parcel* in);
|
|
|
|
// These are public for ease of conversion.
|
|
std::vector<uint8_t> bytes;
|
|
};
|
|
} // Namespace os
|
|
} // Namespace android
|
|
|
|
|
|
#endif // STATS_LOG_EVENT_WRAPPER_H
|
|
|