Merge "Accept a URI for bugreport and screenshot paths to be forwarded to... (f923d445) · Commits · e / os / android_frameworks_base

packages/Shell/Android.bp

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,10 @@ shell_srcs = [
	"src/*/.java",		"src/*/.java",
	":dumpstate_aidl",		":dumpstate_aidl",
	]		]
	shell_static_libs = ["androidx.legacy_legacy-support-v4"]		shell_static_libs = [
			"androidx.legacy_legacy-support-v4",
			"wear_aconfig_declarations_flags_java_lib",
			]

	android_app {		android_app {
	name: "Shell",		name: "Shell",
	@@ -28,6 +31,7 @@ android_app {
	flags_packages: [		flags_packages: [
	"android.security.flags-aconfig",		"android.security.flags-aconfig",
	"android.permission.flags-aconfig",		"android.permission.flags-aconfig",
			"wear_aconfig_declarations",
	],		],
	platform_apis: true,		platform_apis: true,
	certificate: "platform",		certificate: "platform",

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -740,6 +740,9 @@
	<uses-permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE" />		<uses-permission android:name="android.permission.USE_CUSTOM_VIRTUAL_MACHINE" />
	<uses-permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE" />		<uses-permission android:name="android.permission.DEBUG_VIRTUAL_MACHINE" />

			<!-- Permission required to access bugreport and screenshot files created by wear. -->
			<uses-permission android:name="com.google.wear.permission.ACCESS_BUG_REPORT_FILES" />

	<!-- Permission required to run GtsAssistantTestCases -->		<!-- Permission required to run GtsAssistantTestCases -->
	<uses-permission android:name="android.permission.MANAGE_VOICE_KEYPHRASES" />		<uses-permission android:name="android.permission.MANAGE_VOICE_KEYPHRASES" />

+423 −145

File changed.

Preview size limit exceeded, changes collapsed.