Snap for 7478028 from fb60f8f85aa4e14f0dfe27e6bd78ac1513d63cfc to mainline-documentsui-release (e8073383) · Commits · e / os / android_packages_apps_DocumentsUI

Android.bp

+30 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,34 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package {
		default_applicable_licenses: ["packages_apps_DocumentsUI_license"],
		}

		// Added automatically by a large-scale-change that took the approach of
		// 'apply every license found to every target'. While this makes sure we respect
		// every license restriction, it may not be entirely correct.
		//
		// e.g. GPL in an MIT project might only apply to the contrib/ directory.
		//
		// Please consider splitting the single license below into multiple licenses,
		// taking care not to lose any license_kind information, and overriding the
		// default license using the 'licenses: [...]' property on targets as needed.
		//
		// For unused files, consider creating a 'fileGroup' with "//visibility:private"
		// to attach the license to, and including a comment whether the files may be
		// used in the current project.
		// See: http://go/android-license-faq
		license {
		name: "packages_apps_DocumentsUI_license",
		visibility: [":__subpackages__"],
		license_kinds: [
		"SPDX-license-identifier-Apache-2.0",
		"legacy_unencumbered",
		],
		// large-scale-change unable to identify any license_text files
		}

		java_defaults {
		name: "documentsui_defaults",

		@@ -72,7 +100,8 @@ java_library {
		genrule {
		name: "statslog-docsui-java-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module docsui --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --supportQ",
		cmd: "$(location stats-log-api-gen) --java $(out) --module docsui" +
		" --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --minApiLevel 29",
		out: ["com/android/documentsui/DocumentsStatsLog.java"],
		}

AndroidManifest.xml

+9 −3

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@
		<uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>
		<uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG"/>

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

		<application
		android:name=".DocumentsApplication"
		android:label="@string/app_label"
		@@ -169,7 +171,8 @@
		</intent-filter>
		</provider>

		<receiver android:name=".PackageReceiver">
		<receiver android:name=".PackageReceiver"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
		<action android:name="android.intent.action.PACKAGE_DATA_CLEARED" />
		@@ -177,13 +180,15 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".roots.BootReceiver" android:enabled="false">
		<receiver android:name=".roots.BootReceiver" android:enabled="false"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.BOOT_COMPLETED" />
		</intent-filter>
		</receiver>

		<receiver android:name=".PreBootReceiver">
		<receiver android:name=".PreBootReceiver"
		android:exported="true">
		<intent-filter>
		<action android:name="android.intent.action.PRE_BOOT_COMPLETED" />
		</intent-filter>
		@@ -201,6 +206,7 @@
		<activity
		android:name=".selection.demo.SelectionDemoActivity"
		android:label="Selection Demo"
		android:exported="true"
		android:theme="@style/DocumentsTheme">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />

MODULE_LICENSE_APACHE2

deleted100644 → 0

+0 −0

Empty file deleted.

app-perf-tests/Android.bp

+5 −1

Original line number	Diff line number	Diff line
		package {
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		android_test {
		name: "DocumentsUIAppPerfTests",

		@@ -14,9 +18,9 @@ android_test {

		static_libs: [
		"androidx.legacy_legacy-support-v4",
		"collector-device-lib",
		"mockito-target",
		"ub-uiautomator",
		"collector-device-lib",
		],

		platform_apis: true,

app-perf-tests/AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@

		<!-- This package instrumentates itself, so the DocumentsUI process can be killed without
		killing the testing package. -->
		<instrumentation android:name="android.test.InstrumentationTestRunner"
		<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
		android:targetPackage="com.android.documentsui.appperftests"
		android:label="App performance tests for DocumentsUI" />