Merge "Remove flag com.android.server.print.do_not_include_capabilities" into main (eb53b9c0) · Commits · e / os / android_frameworks_base

services/print/Android.bp

+0 −13

Original line number	Diff line number	Diff line
		@@ -18,21 +18,8 @@ java_library_static {
		name: "services.print",
		defaults: ["platform_service_defaults"],
		srcs: [":services.print-sources"],
		static_libs: ["print_flags_lib"],
		libs: ["services.core"],
		lint: {
		baseline_filename: "lint-baseline.xml",
		},
		}

		aconfig_declarations {
		name: "print_flags",
		package: "com.android.server.print",
		container: "system",
		srcs: ["**/flags.aconfig"],
		}

		java_aconfig_library {
		name: "print_flags_lib",
		aconfig_declarations: "print_flags",
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -572,7 +572,6 @@ final class RemotePrintService implements DeathRecipient {

		boolean wasBound = mContext.bindServiceAsUser(mIntent, mServiceConnection,
		Context.BIND_AUTO_CREATE \| Context.BIND_FOREGROUND_SERVICE
		\| (Flags.doNotIncludeCapabilities() ? 0 : Context.BIND_INCLUDE_CAPABILITIES)
		\| Context.BIND_ALLOW_INSTANT,
		new UserHandle(mUserId));

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		package: "com.android.server.print"
		container: "system"

		flag {
		name: "do_not_include_capabilities"
		namespace: "printing"
		description: "Do not use the flag Context.BIND_INCLUDE_CAPABILITIES when binding to the service"
		bug: "291281543"
		}