Merge "AVF: promote FD->IBinder to SystemApi." into main
diff --git a/libs/framework-virtualization/api/system-current.txt b/libs/framework-virtualization/api/system-current.txt
index 233491f..975bafe 100644
--- a/libs/framework-virtualization/api/system-current.txt
+++ b/libs/framework-virtualization/api/system-current.txt
@@ -2,6 +2,7 @@
package android.system.virtualmachine {
public class VirtualMachine implements java.lang.AutoCloseable {
+ method @NonNull @WorkerThread public static android.os.IBinder binderFromPreconnectedClient(@NonNull android.system.virtualmachine.VirtualMachine.VsockConnectionProvider) throws android.system.virtualmachine.VirtualMachineException;
method public void clearCallback();
method @WorkerThread public void close();
method @NonNull @WorkerThread public android.os.IBinder connectToVsockServer(@IntRange(from=android.system.virtualmachine.VirtualMachine.MIN_VSOCK_PORT, to=android.system.virtualmachine.VirtualMachine.MAX_VSOCK_PORT) long) throws android.system.virtualmachine.VirtualMachineException;
@@ -25,6 +26,10 @@
field public static final String USE_CUSTOM_VIRTUAL_MACHINE_PERMISSION = "android.permission.USE_CUSTOM_VIRTUAL_MACHINE";
}
+ public static interface VirtualMachine.VsockConnectionProvider {
+ method @NonNull public android.os.ParcelFileDescriptor addConnection() throws android.system.virtualmachine.VirtualMachineException;
+ }
+
public interface VirtualMachineCallback {
method public void onError(@NonNull android.system.virtualmachine.VirtualMachine, int, @NonNull String);
method public void onPayloadFinished(@NonNull android.system.virtualmachine.VirtualMachine, int);
diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
index ad63206..b8b4ace 100644
--- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
+++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
@@ -1978,8 +1978,11 @@
*
* @hide
*/
+ @SystemApi
+ @SuppressLint("UnflaggedApi") // already existing functionality exposed, users should flag
public interface VsockConnectionProvider {
@NonNull
+ @SuppressLint("UnflaggedApi") // already existing functionality exposed, users should flag
public ParcelFileDescriptor addConnection() throws VirtualMachineException;
}
@@ -2043,6 +2046,8 @@
*
* @hide
*/
+ @SystemApi
+ @SuppressLint("UnflaggedApi") // already existing functionality exposed, users should flag
@WorkerThread
@NonNull
public static IBinder binderFromPreconnectedClient(@NonNull VsockConnectionProvider provider)