Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22b69a77 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "New SystemApi VDM#getAllPersistentDeviceIds" into main

parents f73c4e37 b2145765

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3211,6 +3211,7 @@ package android.companion.virtual { 














  public final class VirtualDeviceManager {















    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.VirtualDeviceManager.VirtualDevice createVirtualDevice(int, @NonNull android.companion.virtual.VirtualDeviceParams);













    method @FlaggedApi("android.companion.virtual.flags.persistent_device_id_api") @NonNull public java.util.Set<java.lang.String> getAllPersistentDeviceIds();















    method @FlaggedApi("android.companion.virtual.flags.persistent_device_id_api") @Nullable public CharSequence getDisplayNameForPersistentDeviceId(@NonNull String);















    field public static final int LAUNCH_FAILURE_NO_ACTIVITY = 2; // 0x2















    field public static final int LAUNCH_FAILURE_PENDING_INTENT_CANCELED = 1; // 0x1

























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



+25
−0




























Original line number
Diff line number
Diff line








@@ -63,6 +63,7 @@ import android.media.AudioManager;













import android.os.Binder;















import android.os.Looper;















import android.os.RemoteException;













import android.util.ArraySet;















import android.util.Log;















import android.view.Surface;















import android.view.WindowManager;









@@ -74,9 +75,11 @@ import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;















import java.lang.annotation.Target;















import java.util.ArrayList;













import java.util.Collections;















import java.util.Iterator;















import java.util.List;















import java.util.Objects;













import java.util.Set;















import java.util.concurrent.Executor;















import java.util.function.IntConsumer;


























@@ -388,6 +391,28 @@ public final class VirtualDeviceManager {













        }















    }





























    /**













     * Returns all current persistent device IDs, including the ones for which no virtual device













     * exists, as long as one may have existed or can be created.













     *













     * @hide













     */













    // TODO(b/315481938): Link @see VirtualDevice#getPersistentDeviceId()













    @FlaggedApi(Flags.FLAG_PERSISTENT_DEVICE_ID_API)













    @SystemApi













    @NonNull













    public Set<String> getAllPersistentDeviceIds() {













        if (mService == null) {













            Log.w(TAG, "Failed to retrieve persistent ids; no virtual device manager service.");













            return Collections.emptySet();













        }













        try {













            return new ArraySet<>(mService.getAllPersistentDeviceIds());













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }





























    /**















     * Checks whether the passed {@code deviceId} is a valid virtual device ID or not.















     * {@link Context#DEVICE_ID_DEFAULT} is not valid as it is the ID of the default