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

.gitignore

+2 −1

Original line number	Diff line number	Diff line
		.idea/
		bin/
		gen/
		*.iml
		.project
		.classpath
		.project
		project.properties

Android.bp

+62 −11

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.
		//

		genrule {
		name: "statslog-permissioncontroller-java-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module permissioncontroller --javaPackage com.android.packageinstaller --javaClass PermissionControllerStatsLog",
		out: ["com/android/packageinstaller/PermissionControllerStatsLog.java"],
		}

		java_library {
		name: "permissioncontroller-statsd",
		sdk_version: "system_current",

		srcs: [
		":statslog-permissioncontroller-java-gen",
		],
		}

		android_app {
		name: "PackageInstaller",
		srcs: ["src/*/.java"],
		name: "PermissionController",
		sdk_version: "system_current",
		min_sdk_version: "28",
		privileged: true,
		certificate: "platform",

		srcs: [
		"src/*/.java",
		"src/*/.proto",
		],

		static_libs: [
		"androidx.car_car",
		"iconloader",
		"com.google.android.material_material",
		"androidx.transition_transition",
		"androidx-constraintlayout_constraintlayout",
		"androidx.core_core",
		"androidx.media_media",
		"androidx.legacy_legacy-support-core-utils",
		@@ -15,17 +58,25 @@ android_app {
		"androidx.legacy_legacy-preference-v14",
		"androidx.leanback_leanback",
		"androidx.leanback_leanback-preference",
		"car-list",
		"SettingsLib",
		"xz-java",
		"androidx.lifecycle_lifecycle-extensions",
		"androidx.lifecycle_lifecycle-common-java8",
		"SettingsLibHelpUtils",
		"SettingsLibRestrictedLockUtils",
		"SettingsLibAppPreference",
		"SettingsLibSearchWidget",
		"SettingsLibLayoutPreference",
		"SettingsLibBarChartPreference",
		"SettingsLibActionBarShadow",
		"SettingsLibProgressBar",
		"androidx.annotation_annotation",
		"permissioncontroller-statsd"
		],
		certificate: "platform",
		privileged: true,

		proto: {
		type: "lite",
		},

		optimize: {
		proguard_flags_files: ["proguard.flags"],
		},
		// Comment for now unitl all private API dependencies are removed
		// LOCAL_SDK_VERSION := system_current
		platform_apis: true,
		}

AndroidManifest.xml

+229 −111

File changed.

Preview size limit exceeded, changes collapsed.

OWNERS

+4 −1

Original line number	Diff line number	Diff line
		@@ -7,4 +7,7 @@ eugenesusla@google.com

		# For automotive related changes
		stenning@google.com
		rogerxue@google.com
		davidln@google.com

		# For incident report related changes
		joeo@google.com

PREUPLOAD.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,4 +4,4 @@ commit_msg_changeid_field = true

		[Hook Scripts]
		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

		strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}