Merge "Remove ConnOnActivityStartTest." into tm-dev (91675161) · Commits · e / os / android_frameworks_base

services/tests/servicestests/Android.bp

+0 −7

Original line number	Diff line number	Diff line
		@@ -19,9 +19,6 @@ android_test {
		"src/*/.java",
		"src/*/.kt",

		"aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl",
		"aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl",

		"test-apps/JobTestApp/src/*/.java",

		"test-apps/SuspendTestApp/src/*/.java",
		@@ -67,10 +64,6 @@ android_test {
		"ActivityContext",
		],

		aidl: {
		local_include_dirs: ["aidl"],
		},

		libs: [
		"android.hardware.power-V1-java",
		"android.hardware.tv.cec-V1.0-java",

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		<option name="install-arg" value="-t" />
		<option name="test-file-name" value="FrameworksServicesTests.apk" />
		<option name="test-file-name" value="JobTestApp.apk" />
		<option name="test-file-name" value="ConnTestApp.apk" />
		<option name="test-file-name" value="SuspendTestApp.apk" />
		<option name="test-file-name" value="SimpleServiceTestApp1.apk" />
		<option name="test-file-name" value="SimpleServiceTestApp2.apk" />

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		// 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.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_base_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_base_license"],
		}

		java_library {
		name: "servicestests-aidl",
		sdk_version: "current",
		srcs: [
		"com/android/servicestests/aidl/INetworkStateObserver.aidl",
		"com/android/servicestests/aidl/ICmdReceiverService.aidl",
		],
		}

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package com.android.servicestests.aidl;

		interface ICmdReceiverService {
		void finishActivity();
		}
		No newline at end of file

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		package com.android.servicestests.aidl;

		oneway interface INetworkStateObserver {
		/**
		* {@param resultData} will be in the format
		* NetinfoState\|NetinfoDetailedState\|RealConnectionCheck\|RealConnectionCheckDetails\|Netinfo.
		* For detailed info, see
		* servicestests/test-apps/ConnTestApp/.../ConnTestActivity#checkNetworkStatus
		*/
		void onNetworkStateChecked(String resultData);
		}
		No newline at end of file