Merge "Added IContentCaptureServiceCallback." (a8b50584) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,7 @@ java_defaults {
		"core/java/android/service/euicc/IUpdateSubscriptionNicknameCallback.aidl",
		"core/java/android/service/gatekeeper/IGateKeeperService.aidl",
		"core/java/android/service/contentcapture/IContentCaptureService.aidl",
		"core/java/android/service/contentcapture/IContentCaptureServiceCallback.aidl",
		"core/java/android/service/notification/INotificationListener.aidl",
		"core/java/android/service/notification/IStatusBarNotificationHolder.aidl",
		"core/java/android/service/notification/IConditionListener.aidl",

core/java/android/service/contentcapture/ContentCaptureService.java

+61 −14

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import com.android.internal.os.IResultReceiver;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Collections;
		import java.util.List;
		import java.util.Set;

		@@ -77,6 +78,7 @@ public abstract class ContentCaptureService extends Service {
		"android.service.contentcapture.ContentCaptureService";

		private Handler mHandler;
		private IContentCaptureServiceCallback mCallback;

		/**
		* Binder that receives calls from the system server.
		@@ -84,9 +86,15 @@ public abstract class ContentCaptureService extends Service {
		private final IContentCaptureService mServerInterface = new IContentCaptureService.Stub() {

		@Override
		public void onConnectedStateChanged(boolean state) {
		mHandler.sendMessage(obtainMessage(ContentCaptureService::handleOnConnectedStateChanged,
		ContentCaptureService.this, state));
		public void onConnected(IBinder callback) {
		mHandler.sendMessage(obtainMessage(ContentCaptureService::handleOnConnected,
		ContentCaptureService.this, callback));
		}

		@Override
		public void onDisconnected() {
		mHandler.sendMessage(obtainMessage(ContentCaptureService::handleOnDisconnected,
		ContentCaptureService.this));
		}

		@Override
		@@ -166,7 +174,16 @@ public abstract class ContentCaptureService extends Service {
		*/
		public final void setContentCaptureWhitelist(@Nullable List<String> packages,
		@Nullable List<ComponentName> activities) {
		//TODO(b/122595322): implement
		final IContentCaptureServiceCallback callback = mCallback;
		if (callback == null) {
		Log.w(TAG, "setContentCaptureWhitelist(): no server callback");
		return;
		}
		try {
		callback.setContentCaptureWhitelist(packages, activities);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		}

		/**
		@@ -177,7 +194,16 @@ public abstract class ContentCaptureService extends Service {
		*/
		public final void setActivityContentCaptureEnabled(@NonNull ComponentName activity,
		boolean enabled) {
		//TODO(b/122595322): implement
		final IContentCaptureServiceCallback callback = mCallback;
		if (callback == null) {
		Log.w(TAG, "setActivityContentCaptureEnabled(): no server callback");
		return;
		}
		try {
		callback.setActivityContentCaptureEnabled(activity, enabled);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		}

		/**
		@@ -188,7 +214,16 @@ public abstract class ContentCaptureService extends Service {
		*/
		public final void setPackageContentCaptureEnabled(@NonNull String packageName,
		boolean enabled) {
		//TODO(b/122595322): implement
		final IContentCaptureServiceCallback callback = mCallback;
		if (callback == null) {
		Log.w(TAG, "setPackageContentCaptureEnabled(): no server callback");
		return;
		}
		try {
		callback.setPackageContentCaptureEnabled(packageName, enabled);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}
		}

		/**
		@@ -197,7 +232,12 @@ public abstract class ContentCaptureService extends Service {
		*/
		@NonNull
		public final Set<ComponentName> getContentCaptureDisabledActivities() {
		//TODO(b/122595322): implement
		final IContentCaptureServiceCallback callback = mCallback;
		if (callback == null) {
		Log.w(TAG, "getContentCaptureDisabledActivities(): no server callback");
		return Collections.emptySet();
		}
		//TODO(b/122595322): implement (using SyncResultReceiver)
		return null;
		}

		@@ -207,7 +247,12 @@ public abstract class ContentCaptureService extends Service {
		*/
		@NonNull
		public final Set<String> getContentCaptureDisabledPackages() {
		//TODO(b/122595322): implement
		final IContentCaptureServiceCallback callback = mCallback;
		if (callback == null) {
		Log.w(TAG, "getContentCaptureDisabledPackages(): no server callback");
		return Collections.emptySet();
		}
		//TODO(b/122595322): implement (using SyncResultReceiver)
		return null;
		}

		@@ -307,12 +352,14 @@ public abstract class ContentCaptureService extends Service {
		}
		}

		private void handleOnConnectedStateChanged(boolean state) {
		if (state) {
		private void handleOnConnected(@NonNull IBinder callback) {
		mCallback = IContentCaptureServiceCallback.Stub.asInterface(callback);
		onConnected();
		} else {
		onDisconnected();
		}

		private void handleOnDisconnected() {
		onDisconnected();
		mCallback = null;
		}

		//TODO(b/111276913): consider caching the InteractionSessionId for the lifetime of the session,

core/java/android/service/contentcapture/IContentCaptureService.aidl

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.service.contentcapture;

		import android.os.IBinder;
		import android.service.contentcapture.SnapshotData;
		import android.view.contentcapture.ContentCaptureContext;

		@@ -29,7 +30,8 @@ import java.util.List;
		* @hide
		*/
		oneway interface IContentCaptureService {
		void onConnectedStateChanged(boolean state);
		void onConnected(IBinder callback);
		void onDisconnected();
		void onSessionStarted(in ContentCaptureContext context, String sessionId, int uid,
		in IResultReceiver clientReceiver);
		void onSessionFinished(String sessionId);

core/java/android/service/contentcapture/IContentCaptureServiceCallback.aidl

0 → 100644

+35 −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 android.service.contentcapture;

		import android.content.ComponentName;
		import com.android.internal.os.IResultReceiver;

		import java.util.List;

		/**
		* Interface from the Content Capture service to the system.
		*
		* @hide
		*/
		oneway interface IContentCaptureServiceCallback {
		void setContentCaptureWhitelist(in List<String> packages, in List<ComponentName> activities);
		void setActivityContentCaptureEnabled(in ComponentName activity, boolean enabled);
		void setPackageContentCaptureEnabled(in String packageName, boolean enabled);
		void getContentCaptureDisabledActivities(in IResultReceiver receiver);
		void getContentCaptureDisabledPackages(in IResultReceiver receiver);
		}

services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java

+56 −4

Original line number	Diff line number	Diff line
		@@ -39,8 +39,10 @@ import android.os.Bundle;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.service.contentcapture.ContentCaptureService;
		import android.service.contentcapture.IContentCaptureServiceCallback;
		import android.service.contentcapture.SnapshotData;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.util.Slog;

		import com.android.internal.annotations.GuardedBy;
		@@ -50,6 +52,7 @@ import com.android.server.infra.AbstractPerUserSystemService;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.List;

		/**
		* Per-user instance of {@link ContentCaptureManagerService}.
		@@ -74,6 +77,9 @@ final class ContentCapturePerUserService
		@GuardedBy("mLock")
		private RemoteContentCaptureService mRemoteService;

		private final ContentCaptureServiceRemoteCallback mRemoteServiceCallback =
		new ContentCaptureServiceRemoteCallback();

		// TODO(b/111276913): add mechanism to prune stale sessions, similar to Autofill's

		ContentCapturePerUserService(@NonNull ContentCaptureManagerService master,
		@@ -102,10 +108,10 @@ final class ContentCapturePerUserService
		}

		if (!disabled) {
		mRemoteService = new RemoteContentCaptureService(
		mMaster.getContext(),
		ContentCaptureService.SERVICE_INTERFACE, serviceComponentName, mUserId, this,
		mMaster.isBindInstantServiceAllowed(), mMaster.verbose);
		mRemoteService = new RemoteContentCaptureService(mMaster.getContext(),
		ContentCaptureService.SERVICE_INTERFACE, serviceComponentName,
		mRemoteServiceCallback, mUserId, this, mMaster.isBindInstantServiceAllowed(),
		mMaster.verbose);
		}
		}

		@@ -339,4 +345,50 @@ final class ContentCapturePerUserService
		}
		return null;
		}

		private final class ContentCaptureServiceRemoteCallback extends
		IContentCaptureServiceCallback.Stub {

		@Override
		public void setContentCaptureWhitelist(List<String> packages,
		List<ComponentName> activities) {
		if (mMaster.verbose) {
		Log.v(TAG, "setContentCaptureWhitelist(packages=" + packages + ", activities="
		+ activities + ")");
		}
		// TODO(b/122595322): implement
		// TODO(b/119613670): log metrics
		}

		@Override
		public void setActivityContentCaptureEnabled(ComponentName activity, boolean enabled) {
		if (mMaster.verbose) {
		Log.v(TAG, "setActivityContentCaptureEnabled(activity=" + activity + ", enabled="
		+ enabled + ")");
		}
		// TODO(b/122595322): implement
		// TODO(b/119613670): log metrics
		}

		@Override
		public void setPackageContentCaptureEnabled(String packageName, boolean enabled) {
		if (mMaster.verbose) {
		Log.v(TAG,
		"setPackageContentCaptureEnabled(packageName=" + packageName + ", enabled="
		+ enabled + ")");
		}
		// TODO(b/122595322): implement
		// TODO(b/119613670): log metrics
		}

		@Override
		public void getContentCaptureDisabledActivities(IResultReceiver receiver) {
		// TODO(b/122595322): implement
		}

		@Override
		public void getContentCaptureDisabledPackages(IResultReceiver receiver) {
		// TODO(b/122595322): implement
		}
		}
		}