Merge changes I10ab56a8,I7e437c3d,I0413c52f (bece5974) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -5465,6 +5465,10 @@
		android:permission="android.permission.BIND_JOB_SERVICE" >
		</service>

		<service android:name="com.android.server.profcollect.ProfcollectForwardingService$ProfcollectBGJobService"
		android:permission="android.permission.BIND_JOB_SERVICE" >
		</service>

		<service
		android:name="com.android.server.autofill.AutofillCompatAccessibilityService"
		android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ filegroup {
		":services.midi-sources",
		":services.net-sources",
		":services.print-sources",
		":services.profcollect-sources",
		":services.restrictions-sources",
		":services.startop.iorap-sources",
		":services.systemcaptions-sources",
		@@ -73,6 +74,7 @@ java_library {
		"services.net",
		"services.people",
		"services.print",
		"services.profcollect",
		"services.restrictions",
		"services.startop",
		"services.systemcaptions",

+7 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ import com.android.server.policy.role.LegacyRoleResolutionPolicy;
		import com.android.server.power.PowerManagerService;
		import com.android.server.power.ShutdownThread;
		import com.android.server.power.ThermalManagerService;
		import com.android.server.profcollect.ProfcollectForwardingService;
		import com.android.server.recoverysystem.RecoverySystemService;
		import com.android.server.restrictions.RestrictionsManagerService;
		import com.android.server.role.RoleManagerService;
		@@ -1219,6 +1220,12 @@ public final class SystemServer {
		mSystemServiceManager.startService(IorapForwardingService.class);
		t.traceEnd();

		if (Build.IS_DEBUGGABLE) {
		t.traceBegin("ProfcollectForwardingService");
		mSystemServiceManager.startService(ProfcollectForwardingService.class);
		t.traceEnd();
		}

		t.traceBegin("SignedConfigService");
		SignedConfigService.registerUpdateReceiver(mSystemContext);
		t.traceEnd();

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2020 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.

		filegroup {
		name: "services.profcollect-javasources",
		srcs: ["src/*/.java"],
		path: "src",
		visibility: ["//frameworks/base/services"],
		}

		filegroup {
		name: "services.profcollect-sources",
		srcs: [
		":services.profcollect-javasources",
		":profcollectd_aidl",
		],
		visibility: ["//frameworks/base/services:__subpackages__"],
		}

		java_library_static {
		name: "services.profcollect",
		srcs: [":services.profcollect-sources"],
		libs: ["services.core"],
		}

0 → 100644

+3 −0