Merge "DO NOT MERGE - Merge Android 10 into master" (d191463b) · Commits · e / os / android_frameworks_base

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		/.idea
		*.iml
		.sw

Android.bp

+115 −9

Original line number	Diff line number	Diff line
		@@ -222,6 +222,7 @@ java_defaults {
		"location/java",
		"lowpan/java",
		"media/java",
		"media/apex/java",
		"media/mca/effect/java",
		"media/mca/filterfw/java",
		"media/mca/filterpacks/java",
		@@ -245,6 +246,7 @@ java_library {
		"framework-protos",
		"game-driver-protos",
		"android.hidl.base-V1.0-java",
		"android.hardware.cas-V1.1-java",
		"android.hardware.cas-V1.0-java",
		"android.hardware.contexthub-V1.0-java",
		"android.hardware.health-V1.0-java-constants",
		@@ -254,15 +256,22 @@ java_library {
		"android.hardware.radio-V1.3-java",
		"android.hardware.radio-V1.4-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V1.0-java",
		"android.hardware.thermal-V1.1-java",
		"android.hardware.thermal-V2.0-java",
		"android.hardware.tv.input-V1.0-java-constants",
		"android.hardware.usb-V1.0-java-constants",
		"android.hardware.usb-V1.1-java-constants",
		"android.hardware.usb-V1.2-java-constants",
		"android.hardware.usb.gadget-V1.0-java",
		"android.hardware.vibrator-V1.0-java",
		"android.hardware.vibrator-V1.1-java",
		"android.hardware.vibrator-V1.2-java",
		"android.hardware.vibrator-V1.3-java",
		"android.hardware.wifi-V1.0-java-constants",
		"devicepolicyprotosnano",

		"com.android.sysprop.apex",
		"PlatformProperties",
		],
		sdk_version: "core_platform",
		@@ -291,6 +300,7 @@ java_defaults {
		sdk_version: "core_platform",
		libs: [
		"ext",
		"updatable_media_stubs",
		],

		jarjar_rules: ":framework-jarjar-rules",
		@@ -300,8 +310,6 @@ java_defaults {
		required: [
		// TODO: remove gps_debug when the build system propagates "required" properly.
		"gps_debug.conf",
		// Loaded with System.loadLibrary by android.view.textclassifier
		"libmedia2_jni",
		],

		dxflags: [
		@@ -309,6 +317,7 @@ java_defaults {
		"--multi-dex",
		],

		plugins: ["view-inspector-annotation-processor"],
		}

		filegroup {
		@@ -330,6 +339,16 @@ filegroup {
		srcs: [
		"core/java/android/os/IStatsCompanionService.aidl",
		"core/java/android/os/IStatsManager.aidl",
		"core/java/android/os/IStatsPullerCallback.aidl",
		],
		path: "core/java",
		}

		filegroup {
		name: "libvibrator_aidl",
		srcs: [
		"core/java/android/os/IExternalVibrationController.aidl",
		"core/java/android/os/IExternalVibratorService.aidl",
		],
		path: "core/java",
		}
		@@ -485,9 +504,9 @@ java_library_host {
		name: "platformprotos",
		srcs: [
		"cmds/am/proto/instrumentation_data.proto",
		"cmds/statsd/src/*/.proto",
		"core/proto/*/.proto",
		"libs/incident/proto/*/.proto",
		"cmds/statsd/src/*/.proto",
		],
		proto: {
		include_dirs: ["external/protobuf/src"],
		@@ -506,7 +525,10 @@ java_library {
		output_params: ["store_unknown_fields=true"],
		include_dirs: ["external/protobuf/src"],
		},

		exclude_srcs: [
		"core/proto/android/privacy.proto",
		"core/proto/android/section.proto",
		],
		sdk_version: "current",
		srcs: [
		"core/proto/*/.proto",
		@@ -526,6 +548,10 @@ java_library {
		"core/proto/*/.proto",
		"libs/incident/proto/android/os/*/.proto",
		],
		exclude_srcs: [
		"core/proto/android/privacy.proto",
		"core/proto/android/section.proto",
		],
		// Protos have lots of MissingOverride and similar.
		errorprone: {
		javacflags: ["-XepDisableAllChecks"],
		@@ -533,9 +559,9 @@ java_library {
		}

		// ==== c++ proto device library ==============================
		cc_library {
		name: "libplatformprotos",
		host_supported: true,
		cc_defaults {
		name: "libplatformprotos-defaults",

		proto: {
		export_proto_headers: true,
		include_dirs: ["external/protobuf/src"],
		@@ -549,8 +575,13 @@ cc_library {

		srcs: [
		"core/proto/*/.proto",
		"libs/incident/*/.proto",
		],
		}

		cc_library {
		name: "libplatformprotos",
		defaults: ["libplatformprotos-defaults"],
		host_supported: true,

		target: {
		host: {
		@@ -562,6 +593,9 @@ cc_library {
		proto: {
		type: "lite",
		},
		shared_libs: [
		"libprotobuf-cpp-lite",
		],
		shared: {
		enabled: false,
		},
		@@ -569,6 +603,55 @@ cc_library {
		},
		}

		// This library is meant for vendor code that needs to output protobuf. It links
		// against the static version of libprotobuf-cpp-lite, for which we can not guarantee
		// binary compatibility.
		cc_library {
		name: "libplatformprotos-static",
		defaults: ["libplatformprotos-defaults"],
		host_supported: false,

		// This is okay because this library is only built as a static library. The C++
		// API is not guaranteed. The proto API is guaranteed to be stable via Metrics Council,
		// but is not authorized to be used outside of debugging.
		vendor_available: true,

		target: {
		android: {
		proto: {
		type: "lite",
		},
		static_libs: [
		"libprotobuf-cpp-lite",
		],
		shared: {
		enabled: false,
		},
		},
		},
		}


		// This is the full proto version of libplatformprotos. It may only
		// be used by test code that is not shipped on the device.
		cc_library {
		name: "libplatformprotos-test",
		defaults: ["libplatformprotos-defaults"],
		host_supported: false,

		target: {
		android: {
		proto: {
		type: "full",
		},
		shared: {
		enabled: false,
		},
		},
		},
		}


		gensrcs {
		name: "gen-platform-proto-constants",
		depfile: true,
		@@ -606,6 +689,7 @@ gensrcs {
		output_extension: "proto.h",
		}


		subdirs = [
		"cmds/*",
		"core/*",
		@@ -803,6 +887,7 @@ stubs_defaults {
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":core_public_api_files",
		":updatable-media-srcs",
		"test-mock/src/*/.java",
		"test-runner/src/*/.java",
		],
		@@ -865,6 +950,7 @@ stubs_defaults {
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":core_public_api_files",
		":updatable-media-srcs",
		],
		libs: ["framework-internal-utils"],
		local_sourcepaths: frameworks_base_subdirs,
		@@ -1041,7 +1127,7 @@ droiddoc {
		],
		proofread_file: "ds-docs-proofrerad.txt",
		args: framework_docs_only_args +
		" -toroot / -samplegroup Admin " +
		" -toroot / -yamlV2 -metalavaApiSince -samplegroup Admin " +
		" -samplegroup Background " +
		" -samplegroup Connectivity " +
		" -samplegroup Content " +
		@@ -1355,6 +1441,26 @@ filegroup {
		],
		}

		filegroup {
		name: "framework-media-annotation-srcs",
		srcs: [
		"core/java/android/annotation/CallbackExecutor.java",
		"core/java/android/annotation/CallSuper.java",
		"core/java/android/annotation/DrawableRes.java",
		"core/java/android/annotation/IntDef.java",
		"core/java/android/annotation/LongDef.java",
		"core/java/android/annotation/NonNull.java",
		"core/java/android/annotation/Nullable.java",
		"core/java/android/annotation/RequiresPermission.java",
		"core/java/android/annotation/SdkConstant.java",
		"core/java/android/annotation/StringDef.java",
		"core/java/android/annotation/SystemApi.java",
		"core/java/android/annotation/TestApi.java",
		"core/java/android/annotation/UnsupportedAppUsage.java",
		"core/java/com/android/internal/annotations/GuardedBy.java",
		],
		}

		// Creates an index of AIDL methods; used for adding UnsupportedAppUsage
		// annotations to private apis
		aidl_mapping {

CleanSpec.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -248,8 +248,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediad
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerService)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin)
		# ******************************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
		# ******************************************************************

apct-tests/perftests/autofill/Android.bp

0 → 100644

+26 −0

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.

		android_test {
		name: "AutofillPerfTests",
		srcs: ["src/*/.java"],
		resource_dirs: ["res"],
		static_libs: [
		"androidx.test.rules",
		"androidx.annotation_annotation",
		"apct-perftests-utils",
		],
		platform_apis: true,
		test_suites: ["device-tests"],
		}

apct-tests/perftests/autofill/AndroidManifest.xml

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- 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.
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.perftests.autofill">

		<application>
		<uses-library android:name="android.test.runner" />
		<activity android:name="android.perftests.utils.StubActivity">
		<intent-filter>
		<action android:name="com.android.perftests.core.PERFTEST" />
		</intent-filter>
		</activity>

		<service
		android:name="android.view.autofill.MyAutofillService"
		android:label="PERF AutofillService"
		android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
		<intent-filter>
		<action android:name="android.service.autofill.AutofillService" />
		</intent-filter>
		</service>

		</application>

		<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
		android:targetPackage="com.android.perftests.autofill"/>
		</manifest>