Merge remote-tracking branch 'origin/lineage-21.0' into v1-u (5bacd4d2) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+25 −50

Original line number	Diff line number	Diff line
		@@ -59,8 +59,6 @@ java_defaults {

		sdk_version: "system_current",
		min_sdk_version: "29",

		lint: { strict_updatability_linting: true }
		}

		platform_compat_config {
		@@ -68,20 +66,17 @@ platform_compat_config {
		src: ":DocumentsUI",
		}

		filegroup {
		name: "DocumentsUI-srcs",
		srcs: [
		"src/*/.java",
		":statslog-docsui-java-gen",
		],
		}

		java_library {
		name: "docsui-statsd",
		srcs: [
		":statslog-docsui-java-gen",
		],
		lint: { strict_updatability_linting: true }
		libs: [
		"androidx.annotation_annotation",
		],
		lint: {
		strict_updatability_linting: true,
		},
		}

		genrule {
		@@ -93,14 +88,10 @@ genrule {
		}

		android_library {
		name: "DocumentsUI-res-lib",
		name: "DocumentsUI-lib",
		defaults: ["documentsui_defaults"],

		manifest: "AndroidManifest.xml",

		static_libs: [
		"androidx.appcompat_appcompat",
		"com.google.android.material_material",
		],
		manifest: "AndroidManifestLib.xml",

		resource_dirs: [
		"res",
		@@ -110,40 +101,31 @@ android_library {
		"--auto-add-overlay",
		],

		srcs: [
		"src/*/.java",
		":statslog-docsui-java-gen",
		],

		sdk_version: "system_current",
		target_sdk_version: "33",
		min_sdk_version: "29",
		lint: { strict_updatability_linting: true }
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}

		android_library {
		name: "DocumentsUIUnitTests-res-lib",

		manifest: "AndroidManifestForUnitTests.xml",

		static_libs: [
		"androidx.appcompat_appcompat",
		"com.google.android.material_material",
		"modules-utils-build_system",
		],

		resource_dirs: [
		"res",
		],
		name: "DocumentsUIManifestLib",
		defaults: ["documentsui_defaults"],

		licenses: [
		"Android-Apache-2.0",
		"packages_apps_DocumentsUI_res_drawable_pd_license",
		],
		manifest: "AndroidManifest.xml",

		aaptflags: [
		"--auto-add-overlay",
		],
		resource_dirs: [],
		libs: ["DocumentsUI-lib"],

		sdk_version: "system_current",
		target_sdk_version: "33",
		min_sdk_version: "29",
		lint: { strict_updatability_linting: true }
		}

		android_app {
		@@ -153,13 +135,8 @@ android_app {

		manifest: "AndroidManifest.xml",

		srcs: [
		":DocumentsUI-srcs",
		],

		resource_dirs: [
		"res",
		],
		static_libs: ["DocumentsUI-lib"],
		resource_dirs: [],

		licenses: [
		"Android-Apache-2.0",
		@@ -170,6 +147,4 @@ android_app {

		min_sdk_version: "29",
		updatable: true,
		lint: { strict_updatability_linting: true }
		}

AndroidManifest.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@

		<uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>

		<!-- Permissions required for reading device configs -->
		<uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>

		<application
		android:name=".DocumentsApplication"
		android:label="@string/app_label"

AndroidManifestForUnitTests.xml→AndroidManifestLib.xml

+0 −0

File moved.

View file

lint-baseline.xml

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">
		<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">

		<issue
		id="NewApi"

perf-tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ android_test {
		manifest: "AndroidManifest.xml",

		srcs: [
		":DocumentsUIPerfTests-files",
		"src/*/.java",
		],

		@@ -23,6 +22,7 @@ android_test {
		],

		static_libs: [
		"DocumentsUIPerfTests-lib",
		"androidx.legacy_legacy-support-v4",
		"androidx.test.rules",
		"androidx.test.espresso.core",