Merge "Remove StatsEvent.h/cpp and StatsEvent.aidl" (b88b2a98) · Commits · e / os / android_frameworks_base

core/java/android/util/StatsEvent.aidl

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2019, 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.
		*/

		package android.util;

		parcelable StatsEvent cpp_header "android/util/StatsEvent.h";

libs/services/Android.bp

+2 −3

Original line number	Diff line number	Diff line
		@@ -22,13 +22,12 @@ cc_library_shared {
		"src/os/DropBoxManager.cpp",
		"src/os/StatsDimensionsValue.cpp",
		"src/os/StatsLogEventWrapper.cpp",
		"src/util/StatsEvent.cpp",
		],

		shared_libs: [
		"libbinder",
		"liblog",
		"libcutils",
		"liblog",
		"libutils",
		],
		header_libs: [

libs/services/include/android/util/StatsEvent.h

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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_EVENT_H
		#define STATS_EVENT_H

		#include <binder/Parcel.h>
		#include <binder/Parcelable.h>
		#include <binder/Status.h>
		#include <vector>

		namespace android {
		namespace util {
		class StatsEvent : public android::Parcelable {
		public:
		StatsEvent();

		StatsEvent(StatsEvent&& in) = default;

		android::status_t writeToParcel(android::Parcel* out) const;

		android::status_t readFromParcel(const android::Parcel* in);

		private:
		int mAtomTag;
		std::vector<uint8_t> mBuffer;
		};
		} // Namespace util
		} // Namespace android

		#endif // STATS_ EVENT_H
		No newline at end of file

libs/services/src/util/StatsEvent.cpp

deleted100644 → 0

+0 −58

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.
		*/
		#include <android/util/StatsEvent.h>

		#include <binder/Parcel.h>
		#include <binder/Parcelable.h>
		#include <binder/Status.h>
		#include <vector>

		using android::Parcel;
		using android::Parcelable;
		using android::status_t;
		using std::vector;

		namespace android {
		namespace util {

		StatsEvent::StatsEvent(){};

		status_t StatsEvent::writeToParcel(Parcel* out) const {
		// Implement me if desired. We don't currently use this.
		ALOGE("Cannot do c++ StatsEvent.writeToParcel(); it is not implemented.");
		(void)out; // To prevent compile error of unused parameter 'out'
		return UNKNOWN_ERROR;
		};

		status_t StatsEvent::readFromParcel(const Parcel* in) {
		status_t res = OK;
		if (in == NULL) {
		ALOGE("statsd received parcel argument was NULL.");
		return BAD_VALUE;
		}
		if ((res = in->readInt32(&mAtomTag)) != OK) {
		ALOGE("statsd could not read atom tag from parcel");
		return res;
		}
		if ((res = in->readByteVector(&mBuffer)) != OK) {
		ALOGE("statsd could not read buffer from parcel");
		return res;
		}
		return NO_ERROR;
		};

		} // Namespace util
		} // Namespace android