Merge "Create VirtualDeviceManager" (b86bdb49) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ package android {
		field public static final String CONTROL_OEM_PAID_NETWORK_PREFERENCE = "android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE";
		field public static final String CONTROL_VPN = "android.permission.CONTROL_VPN";
		field public static final String CREATE_USERS = "android.permission.CREATE_USERS";
		field public static final String CREATE_VIRTUAL_DEVICE = "android.permission.CREATE_VIRTUAL_DEVICE";
		field public static final String CRYPT_KEEPER = "android.permission.CRYPT_KEEPER";
		field public static final String DEVICE_POWER = "android.permission.DEVICE_POWER";
		field public static final String DISABLE_SYSTEM_SOUND_EFFECTS = "android.permission.DISABLE_SYSTEM_SOUND_EFFECTS";
		@@ -2333,6 +2334,17 @@ package android.companion {

		}

		package android.companion.virtual {

		public final class VirtualDeviceManager {
		}

		public static class VirtualDeviceManager.VirtualDevice implements java.lang.AutoCloseable {
		method public void close();
		}

		}

		package android.content {

		public class ApexEnvironment {

core/java/android/app/SystemServiceRegistry.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ import android.appwidget.AppWidgetManager;
		import android.bluetooth.BluetoothManager;
		import android.companion.CompanionDeviceManager;
		import android.companion.ICompanionDeviceManager;
		import android.companion.virtual.IVirtualDeviceManager;
		import android.companion.virtual.VirtualDeviceManager;
		import android.content.ClipboardManager;
		import android.content.ContentCaptureOptions;
		import android.content.Context;
		@@ -875,6 +877,16 @@ public final class SystemServiceRegistry {
		return new CompanionDeviceManager(service, ctx.getOuterContext());
		}});

		registerService(Context.VIRTUAL_DEVICE_SERVICE, VirtualDeviceManager.class,
		new CachedServiceFetcher<VirtualDeviceManager>() {
		@Override
		public VirtualDeviceManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		IVirtualDeviceManager service = IVirtualDeviceManager.Stub.asInterface(
		ServiceManager.getServiceOrThrow(Context.VIRTUAL_DEVICE_SERVICE));
		return new VirtualDeviceManager(service, ctx.getOuterContext());
		}});

		registerService(Context.CONSUMER_IR_SERVICE, ConsumerIrManager.class,
		new CachedServiceFetcher<ConsumerIrManager>() {
		@Override

core/java/android/companion/virtual/IVirtualDevice.aidl

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.companion.virtual;

		/**
		* Interface for a virtual device.
		*
		* @hide
		*/
		interface IVirtualDevice {
		void close();
		}

core/java/android/companion/virtual/IVirtualDeviceManager.aidl

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.companion.virtual;

		import android.companion.virtual.IVirtualDevice;

		/**
		* Interface for communication between VirtualDeviceManager and VirtualDeviceManagerService.
		*
		* @hide
		*/
		interface IVirtualDeviceManager {

		IVirtualDevice createVirtualDevice();
		}

core/java/android/companion/virtual/VirtualDeviceManager.java

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.companion.virtual;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.content.Context;
		import android.os.RemoteException;

		/**
		* System level service for managing virtual devices.
		*
		* @hide
		*/
		@SystemApi
		@SystemService(Context.VIRTUAL_DEVICE_SERVICE)
		public final class VirtualDeviceManager {

		private static final boolean DEBUG = false;
		private static final String LOG_TAG = "VirtualDeviceManager";

		private final IVirtualDeviceManager mService;
		private final Context mContext;

		/** @hide */
		public VirtualDeviceManager(
		@Nullable IVirtualDeviceManager service, @NonNull Context context) {
		mService = service;
		mContext = context;
		}

		/**
		* Creates a virtual device.
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
		@Nullable
		public VirtualDevice createVirtualDevice() {
		// TODO(b/194949534): Add CDM association ID here and unhide this API
		try {
		IVirtualDevice virtualDevice = mService.createVirtualDevice();
		return new VirtualDevice(mContext, virtualDevice);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* A virtual device has its own virtual display, audio output, microphone, and camera etc. The
		* creator of a virtual device can take the output from the virtual display and stream it over
		* to another device, and inject input events that are received from the remote device.
		*/
		public static class VirtualDevice implements AutoCloseable {

		private final Context mContext;
		private final IVirtualDevice mVirtualDevice;

		private VirtualDevice(Context context, IVirtualDevice virtualDevice) {
		mContext = context.getApplicationContext();
		mVirtualDevice = virtualDevice;
		}

		/**
		* Closes the virtual device, stopping and tearing down any virtual displays,
		* audio policies, and event injection that's currently in progress.
		*/
		public void close() {
		try {
		mVirtualDevice.close();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}
		}