Snap for 5268116 from 7de6f68ff865afa3b329b605b78d0cf0df2a050d to qt-release (2a6a2770) · Commits · e / os / android_frameworks_native

cmds/dumpstate/Android.bp

+19 −2

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ cc_library_shared {
		export_aidl_headers: true,
		},
		srcs: [
		"binder/android/os/DumpstateOptions.cpp",
		":dumpstate_aidl",
		],
		export_include_dirs: ["binder"],
		@@ -68,7 +67,6 @@ filegroup {
		srcs: [
		"binder/android/os/IDumpstateListener.aidl",
		"binder/android/os/IDumpstateToken.aidl",
		//"binder/android/os/DumpstateOptions.aidl",
		"binder/android/os/IDumpstate.aidl",
		],
		path: "binder",
		@@ -159,3 +157,22 @@ cc_test {
		],
		static_libs: ["libgmock"],
		}


		// =======================#
		// dumpstate_test_fixture #
		// =======================#
		cc_test {

		name: "dumpstate_test_fixture",
		test_suites: ["device-tests"],
		cflags: [
		"-Wall",
		"-Werror",
		"-Wno-missing-field-initializers",
		"-Wno-unused-variable",
		"-Wunused-parameter",
		],
		srcs: ["tests/dumpstate_test_fixture.cpp"],
		data: ["tests/testdata/*/"],
		}

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)

		# =======================#
		# dumpstate_test_fixture #
		# =======================#
		include $(CLEAR_VARS)

		LOCAL_MODULE := dumpstate_test_fixture
		LOCAL_COMPATIBILITY_SUITE := device-tests
		LOCAL_MODULE_TAGS := tests

		LOCAL_CFLAGS := \
		-Wall -Werror -Wno-missing-field-initializers -Wno-unused-variable -Wunused-parameter

		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_SRC_FILES := \
		tests/dumpstate_test_fixture.cpp

		LOCAL_TEST_DATA := $(call find-test-data-in-subdirs, $(LOCAL_PATH), *, tests/testdata)

		include $(BUILD_NATIVE_TEST)

deleted100644 → 0

+0 −23

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

		/**
		* Specifies arguments for IDumpstate.
		* {@hide}
		*/
		parcelable DumpstateOptions cpp_header "android/os/DumpstateOptions.h";

deleted100644 → 0

+0 −46

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

		#include <binder/IBinder.h>
		#include <binder/Parcel.h>

		namespace android {
		namespace os {

		status_t DumpstateOptions::readFromParcel(const ::android::Parcel* parcel) {
		if (status_t err = parcel->readBool(&get_section_details)) {
		return err;
		}
		if (status_t err = parcel->readUtf8FromUtf16(&name)) {
		return err;
		}
		return android::OK;
		}

		status_t DumpstateOptions::writeToParcel(::android::Parcel* parcel) const {
		if (status_t err = parcel->writeBool(get_section_details)) {
		return err;
		}
		if (status_t err = parcel->writeUtf8AsUtf16(name)) {
		return err;
		}
		return android::OK;
		}

		} // namespace os
		} // namespace android

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2018, 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 ANDROID_OS_DUMPSTATE_OPTIONS_H_
		#define ANDROID_OS_DUMPSTATE_OPTIONS_H_

		#include <binder/Parcelable.h>

		namespace android {
		namespace os {

		struct DumpstateOptions : public android::Parcelable {
		// If true the caller can get callbacks with per-section progress details.
		bool get_section_details = false;

		// Name of the caller.
		std::string name;

		status_t writeToParcel(android::Parcel* parcel) const override;
		status_t readFromParcel(const android::Parcel* parcel) override;
		};

		} // namespace os
		} // namespace android

		#endif // ANDROID_OS_DUMPSTATE_OPTIONS_H_