Merge "Add the skeleton code for People Service which is a new system service... (e569d7b0) · Commits · e / os / android_frameworks_base

services/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ java_library {
		"services.devicepolicy",
		"services.midi",
		"services.net",
		"services.people",
		"services.print",
		"services.restrictions",
		"services.startop",

services/core/java/com/android/server/people/PeopleServiceInternal.java

0 → 100644

+24 −0

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

		package com.android.server.people;

		import android.service.appprediction.IPredictionService;

		/**
		* @hide Only for use within the system server.
		*/
		public abstract class PeopleServiceInternal extends IPredictionService.Stub {}

services/java/com/android/server/SystemServer.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ import com.android.server.om.OverlayManagerService;
		import com.android.server.os.BugreportManagerService;
		import com.android.server.os.DeviceIdentifiersPolicyService;
		import com.android.server.os.SchedulingPolicyService;
		import com.android.server.people.PeopleService;
		import com.android.server.pm.BackgroundDexOptService;
		import com.android.server.pm.CrossProfileAppsService;
		import com.android.server.pm.DataLoaderManagerService;
		@@ -1917,6 +1918,10 @@ public final class SystemServer {
		t.traceBegin("StartCrossProfileAppsService");
		mSystemServiceManager.startService(CrossProfileAppsService.class);
		t.traceEnd();

		t.traceBegin("StartPeopleService");
		mSystemServiceManager.startService(PeopleService.class);
		t.traceEnd();
		}

		if (!isWatch) {

services/people/Android.bp

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		java_library_static {
		name: "services.people",
		srcs: ["java/*/.java"],
		libs: ["services.core"],
		}

services/people/java/com/android/server/people/PeopleService.java

0 → 100644

+141 −0

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

		package com.android.server.people;

		import android.app.prediction.AppPredictionContext;
		import android.app.prediction.AppPredictionSessionId;
		import android.app.prediction.AppTarget;
		import android.app.prediction.AppTargetEvent;
		import android.app.prediction.IPredictionCallback;
		import android.content.Context;
		import android.content.pm.ParceledListSlice;
		import android.os.RemoteException;
		import android.util.ArrayMap;
		import android.util.Slog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.SystemService;

		import java.util.List;
		import java.util.Map;
		import java.util.function.Consumer;

		/**
		* A service that manages the people and conversations provided by apps.
		*/
		public class PeopleService extends SystemService {

		private static final String TAG = "PeopleService";

		/**
		* Initializes the system service.
		*
		* @param context The system server context.
		*/
		public PeopleService(Context context) {
		super(context);
		}

		@Override
		public void onStart() {
		publishLocalService(PeopleServiceInternal.class, new LocalService());
		}

		@VisibleForTesting
		final class LocalService extends PeopleServiceInternal {

		private Map<AppPredictionSessionId, SessionInfo> mSessions = new ArrayMap<>();

		@Override
		public void onCreatePredictionSession(AppPredictionContext context,
		AppPredictionSessionId sessionId) {
		mSessions.put(sessionId, new SessionInfo(context));
		}

		@Override
		public void notifyAppTargetEvent(AppPredictionSessionId sessionId, AppTargetEvent event) {
		runForSession(sessionId,
		sessionInfo -> sessionInfo.getPredictor().onAppTargetEvent(event));
		}

		@Override
		public void notifyLaunchLocationShown(AppPredictionSessionId sessionId,
		String launchLocation, ParceledListSlice targetIds) {
		runForSession(sessionId,
		sessionInfo -> sessionInfo.getPredictor().onLaunchLocationShown(
		launchLocation, targetIds.getList()));
		}

		@Override
		public void sortAppTargets(AppPredictionSessionId sessionId, ParceledListSlice targets,
		IPredictionCallback callback) {
		runForSession(sessionId,
		sessionInfo -> sessionInfo.getPredictor().onSortAppTargets(
		targets.getList(),
		targetList -> invokePredictionCallback(callback, targetList)));
		}

		@Override
		public void registerPredictionUpdates(AppPredictionSessionId sessionId,
		IPredictionCallback callback) {
		runForSession(sessionId, sessionInfo -> sessionInfo.addCallback(callback));
		}

		@Override
		public void unregisterPredictionUpdates(AppPredictionSessionId sessionId,
		IPredictionCallback callback) {
		runForSession(sessionId, sessionInfo -> sessionInfo.removeCallback(callback));
		}

		@Override
		public void requestPredictionUpdate(AppPredictionSessionId sessionId) {
		runForSession(sessionId,
		sessionInfo -> sessionInfo.getPredictor().onRequestPredictionUpdate());
		}

		@Override
		public void onDestroyPredictionSession(AppPredictionSessionId sessionId) {
		runForSession(sessionId, sessionInfo -> {
		sessionInfo.onDestroy();
		mSessions.remove(sessionId);
		});
		}

		@VisibleForTesting
		SessionInfo getSessionInfo(AppPredictionSessionId sessionId) {
		return mSessions.get(sessionId);
		}

		private void runForSession(AppPredictionSessionId sessionId, Consumer<SessionInfo> method) {
		SessionInfo sessionInfo = mSessions.get(sessionId);
		if (sessionInfo == null) {
		Slog.e(TAG, "Failed to find the session: " + sessionId);
		return;
		}
		method.accept(sessionInfo);
		}

		private void invokePredictionCallback(IPredictionCallback callback,
		List<AppTarget> targets) {
		try {
		callback.onResult(new ParceledListSlice<>(targets));
		} catch (RemoteException e) {
		Slog.e(TAG, "Failed to calling callback" + e);
		}
		}
		}
		}