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

Commit 54a9e49d authored by Marco Loaiza's avatar Marco Loaiza
Browse files

Move DEVICE_ID_DEFAULT from VDM to Context 

- DEVICE_ID_DEFAULT refers to the non-virtual default device,
  having this constant in VDM might cause the impression that
  methods that return or make use of this are refering to a
  virtual device when they are not.
- This constant is not extensibly used in VDM, including the method
  isValidVirtualDeviceId for which DEVICE_ID_DEFAULT returns false,
  making it not very clear why this should live in VDM.
- For consistency also move DEVICE_ID_INVALID

Bug: 266178780
Test: just refactor
Change-Id: I31d32cb35c87deb09347fed34a422e457f0f8f3a
parent 47fddf4d

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9311,8 +9311,6 @@ package android.companion.virtual { 














  public final class VirtualDeviceManager {















    method @NonNull public java.util.List<android.companion.virtual.VirtualDevice> getVirtualDevices();













    field public static final int DEVICE_ID_DEFAULT = 0; // 0x0













    field public static final int DEVICE_ID_INVALID = -1; // 0xffffffff















  }





























}










@@ -10078,6 +10076,8 @@ package android.content {













    field public static final int CONTEXT_RESTRICTED = 4; // 0x4















    field public static final String CREDENTIAL_SERVICE = "credential";















    field public static final String CROSS_PROFILE_APPS_SERVICE = "crossprofileapps";













    field public static final int DEVICE_ID_DEFAULT = 0; // 0x0













    field public static final int DEVICE_ID_INVALID = -1; // 0xffffffff















    field public static final String DEVICE_LOCK_SERVICE = "device_lock";















    field public static final String DEVICE_POLICY_SERVICE = "device_policy";















    field public static final String DISPLAY_HASH_SERVICE = "display_hash";

























core/java/android/app/ActivityThread.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -4559,7 +4559,7 @@ public final class ActivityThread extends ClientTransactionHandler













                    ActivityManager.getService());















            if (!service.isUiContext()) { // WindowProviderService is a UI Context.















                VirtualDeviceManager vdm = context.getSystemService(VirtualDeviceManager.class);













                if (mLastReportedDeviceId == VirtualDeviceManager.DEVICE_ID_DEFAULT













                if (mLastReportedDeviceId == Context.DEVICE_ID_DEFAULT















                        || vdm.isValidVirtualDeviceId(mLastReportedDeviceId)) {















                    service.updateDeviceId(mLastReportedDeviceId);















                }










@@ -6087,7 +6087,7 @@ public final class ActivityThread extends ClientTransactionHandler





























    private void updateDeviceIdForNonUIContexts(int deviceId) {















        // Invalid device id is treated as a no-op.













        if (deviceId == VirtualDeviceManager.DEVICE_ID_INVALID) {













        if (deviceId == Context.DEVICE_ID_INVALID) {















            return;















        }















        if (deviceId == mLastReportedDeviceId) {

































core/java/android/app/ContextImpl.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -244,7 +244,7 @@ class ContextImpl extends Context {













    @UnsupportedAppUsage















    private @NonNull Resources mResources;















    private @Nullable Display mDisplay; // may be null if invalid display or not initialized yet.













    private int mDeviceId = VirtualDeviceManager.DEVICE_ID_DEFAULT;













    private int mDeviceId = Context.DEVICE_ID_DEFAULT;































    /**















     * If set to {@code true} the resources for this context will be configured for mDisplay which










@@ -2756,7 +2756,7 @@ class ContextImpl extends Context {





























    @Override















    public @NonNull Context createDeviceContext(int deviceId) {













        if (deviceId != VirtualDeviceManager.DEVICE_ID_DEFAULT) {













        if (deviceId != Context.DEVICE_ID_DEFAULT) {















            VirtualDeviceManager vdm = getSystemService(VirtualDeviceManager.class);















            if (!vdm.isValidVirtualDeviceId(deviceId)) {















                throw new IllegalArgumentException(










@@ -3036,7 +3036,7 @@ class ContextImpl extends Context {





























    @Override















    public void updateDeviceId(int updatedDeviceId) {













        if (updatedDeviceId != VirtualDeviceManager.DEVICE_ID_DEFAULT) {













        if (updatedDeviceId != Context.DEVICE_ID_DEFAULT) {















            VirtualDeviceManager vdm = getSystemService(VirtualDeviceManager.class);















            if (!vdm.isValidVirtualDeviceId(updatedDeviceId)) {















                throw new IllegalArgumentException(

































core/java/android/companion/virtual/VirtualDevice.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.companion.virtual;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.content.Context;















import android.os.Parcel;















import android.os.Parcelable;

























@@ -38,9 +39,9 @@ public final class VirtualDevice implements Parcelable {













     * @hide















     */















    public VirtualDevice(int id, @Nullable String name) {













        if (id <= VirtualDeviceManager.DEVICE_ID_DEFAULT) {













        if (id <= Context.DEVICE_ID_DEFAULT) {















            throw new IllegalArgumentException("VirtualDevice ID mist be greater than "













                    + VirtualDeviceManager.DEVICE_ID_DEFAULT);













                    + Context.DEVICE_ID_DEFAULT);















        }















        mId = id;















        mName = name;

































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



+2
−12




























Original line number
Diff line number
Diff line








@@ -95,16 +95,6 @@ public final class VirtualDeviceManager {













                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH















                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_FOCUS;





























    /**













     * The default device ID, which is the ID of the primary (non-virtual) device.













     */













    public static final int DEVICE_ID_DEFAULT = 0;



























    /**













     * Invalid device ID.













     */













    public static final int DEVICE_ID_INVALID = -1;





























    /**















     * Broadcast Action: A Virtual Device was removed.















     *










@@ -248,7 +238,7 @@ public final class VirtualDeviceManager {













    public int getDeviceIdForDisplayId(int displayId) {















        if (mService == null) {















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













            return DEVICE_ID_DEFAULT;













            return Context.DEVICE_ID_DEFAULT;















        }















        try {















            return mService.getDeviceIdForDisplayId(displayId);









@@ -259,7 +249,7 @@ public final class VirtualDeviceManager {





























    /**















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













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













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















     * device which is not a virtual device. {@code deviceId} must correspond to a virtual device















     * created by {@link VirtualDeviceManager#createVirtualDevice(int, VirtualDeviceParams)}.















     *