diff options
10 files changed, 33 insertions, 33 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 1e398b501971..b0b2050aaacd 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -9181,8 +9181,8 @@ package android.companion.virtual { public final class VirtualDeviceManager { method @NonNull public java.util.List<android.companion.virtual.VirtualDevice> getVirtualDevices(); - field public static final int DEFAULT_DEVICE_ID = 0; // 0x0 - field public static final int INVALID_DEVICE_ID = -1; // 0xffffffff + field public static final int DEVICE_ID_DEFAULT = 0; // 0x0 + field public static final int DEVICE_ID_INVALID = -1; // 0xffffffff } } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 042bdd7e2ed5..39f71539b380 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -243,7 +243,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.DEFAULT_DEVICE_ID; + private int mDeviceId = VirtualDeviceManager.DEVICE_ID_DEFAULT; /** * If set to {@code true} the resources for this context will be configured for mDisplay which @@ -2699,8 +2699,8 @@ class ContextImpl extends Context { @Override public @NonNull Context createDeviceContext(int deviceId) { - boolean validDeviceId = deviceId == VirtualDeviceManager.DEFAULT_DEVICE_ID; - if (deviceId > VirtualDeviceManager.DEFAULT_DEVICE_ID) { + boolean validDeviceId = deviceId == VirtualDeviceManager.DEVICE_ID_DEFAULT; + if (deviceId > VirtualDeviceManager.DEVICE_ID_DEFAULT) { VirtualDeviceManager vdm = getSystemService(VirtualDeviceManager.class); if (vdm != null) { List<VirtualDevice> virtualDevices = vdm.getVirtualDevices(); diff --git a/core/java/android/companion/virtual/VirtualDevice.java b/core/java/android/companion/virtual/VirtualDevice.java index 9e95d472f48b..f3f433540ef7 100644 --- a/core/java/android/companion/virtual/VirtualDevice.java +++ b/core/java/android/companion/virtual/VirtualDevice.java @@ -38,9 +38,9 @@ public final class VirtualDevice implements Parcelable { * @hide */ public VirtualDevice(int id, @Nullable String name) { - if (id <= VirtualDeviceManager.DEFAULT_DEVICE_ID) { + if (id <= VirtualDeviceManager.DEVICE_ID_DEFAULT) { throw new IllegalArgumentException("VirtualDevice ID mist be greater than " - + VirtualDeviceManager.DEFAULT_DEVICE_ID); + + VirtualDeviceManager.DEVICE_ID_DEFAULT); } mId = id; mName = name; diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java index 109f4b1931f9..4d6997076b4e 100644 --- a/core/java/android/companion/virtual/VirtualDeviceManager.java +++ b/core/java/android/companion/virtual/VirtualDeviceManager.java @@ -88,12 +88,12 @@ public final class VirtualDeviceManager { /** * The default device ID, which is the ID of the primary (non-virtual) device. */ - public static final int DEFAULT_DEVICE_ID = 0; + public static final int DEVICE_ID_DEFAULT = 0; /** * Invalid device ID. */ - public static final int INVALID_DEVICE_ID = -1; + public static final int DEVICE_ID_INVALID = -1; /** * Broadcast Action: A Virtual Device was removed. @@ -238,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 DEFAULT_DEVICE_ID; + return DEVICE_ID_DEFAULT; } try { return mService.getDeviceIdForDisplayId(displayId); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index df5a1ed661cd..382e2bb6ee43 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -6903,7 +6903,7 @@ public abstract class Context { * <p> * Applications that run on virtual devices may use this method to access the default device * capabilities and functionality (by passing - * {@link android.companion.virtual.VirtualDeviceManager#DEFAULT_DEVICE_ID}. Similarly, + * {@link android.companion.virtual.VirtualDeviceManager#DEVICE_ID_DEFAULT}. Similarly, * applications running on the default device may access the functionality of virtual devices. * </p> * @param deviceId The ID of the device to associate with this context. @@ -7245,7 +7245,7 @@ public abstract class Context { * determine whether they are running on a virtual device and identify that device. * * The device ID of the host device is - * {@link android.companion.virtual.VirtualDeviceManager#DEFAULT_DEVICE_ID} + * {@link android.companion.virtual.VirtualDeviceManager#DEVICE_ID_DEFAULT} * * @return the ID of the device this context is associated with. * @see #createDeviceContext(int) diff --git a/core/java/android/hardware/SystemSensorManager.java b/core/java/android/hardware/SystemSensorManager.java index 161b1b71121e..9388ae3fd5e4 100644 --- a/core/java/android/hardware/SystemSensorManager.java +++ b/core/java/android/hardware/SystemSensorManager.java @@ -17,7 +17,7 @@ package android.hardware; import static android.companion.virtual.VirtualDeviceManager.ACTION_VIRTUAL_DEVICE_REMOVED; -import static android.companion.virtual.VirtualDeviceManager.DEFAULT_DEVICE_ID; +import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT; import static android.companion.virtual.VirtualDeviceManager.EXTRA_VIRTUAL_DEVICE_ID; import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT; import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS; @@ -530,7 +530,7 @@ public class SystemSensorManager extends SensorManager { if (intent.getAction().equals(ACTION_VIRTUAL_DEVICE_REMOVED)) { synchronized (mFullRuntimeSensorListByDevice) { final int deviceId = intent.getIntExtra( - EXTRA_VIRTUAL_DEVICE_ID, DEFAULT_DEVICE_ID); + EXTRA_VIRTUAL_DEVICE_ID, DEVICE_ID_DEFAULT); List<Sensor> removedSensors = mFullRuntimeSensorListByDevice.removeReturnOld(deviceId); if (removedSensors != null) { @@ -1134,7 +1134,7 @@ public class SystemSensorManager extends SensorManager { } private boolean isDeviceSensorPolicyDefault(int deviceId) { - if (deviceId == DEFAULT_DEVICE_ID) { + if (deviceId == DEVICE_ID_DEFAULT) { return true; } if (mVdm == null) { diff --git a/core/tests/coretests/src/android/content/ContextTest.java b/core/tests/coretests/src/android/content/ContextTest.java index bc356f80dca1..324f81084f98 100644 --- a/core/tests/coretests/src/android/content/ContextTest.java +++ b/core/tests/coretests/src/android/content/ContextTest.java @@ -16,7 +16,7 @@ package android.content; -import static android.companion.virtual.VirtualDeviceManager.DEFAULT_DEVICE_ID; +import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT; import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY; import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC; import static android.view.Display.DEFAULT_DISPLAY; @@ -216,7 +216,7 @@ public class ContextTest { final Context systemContext = ActivityThread.currentActivityThread().getSystemContext(); - assertEquals(systemContext.getDeviceId(), DEFAULT_DEVICE_ID); + assertEquals(systemContext.getDeviceId(), DEVICE_ID_DEFAULT); } @Test @@ -224,7 +224,7 @@ public class ContextTest { final Context systemUiContext = ActivityThread.currentActivityThread().getSystemUiContext(); - assertEquals(systemUiContext.getDeviceId(), DEFAULT_DEVICE_ID); + assertEquals(systemUiContext.getDeviceId(), DEVICE_ID_DEFAULT); } @Test @@ -232,7 +232,7 @@ public class ContextTest { final Context testContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals(testContext.getDeviceId(), DEFAULT_DEVICE_ID); + assertEquals(testContext.getDeviceId(), DEVICE_ID_DEFAULT); } private Context createUiContext() { diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java index f07d2855c986..e092f4998c7d 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java @@ -78,7 +78,7 @@ public class VirtualDeviceManagerService extends SystemService { private final PendingTrampolineMap mPendingTrampolines = new PendingTrampolineMap(mHandler); private static AtomicInteger sNextUniqueIndex = new AtomicInteger( - VirtualDeviceManager.DEFAULT_DEVICE_ID + 1); + VirtualDeviceManager.DEVICE_ID_DEFAULT + 1); /** * Mapping from user IDs to CameraAccessControllers. @@ -401,7 +401,7 @@ public class VirtualDeviceManagerService extends SystemService { @Override // Binder call public int getDeviceIdForDisplayId(int displayId) { if (displayId == Display.INVALID_DISPLAY || displayId == Display.DEFAULT_DISPLAY) { - return VirtualDeviceManager.DEFAULT_DEVICE_ID; + return VirtualDeviceManager.DEVICE_ID_DEFAULT; } synchronized (mVirtualDeviceManagerLock) { for (int i = 0; i < mVirtualDevices.size(); i++) { @@ -411,7 +411,7 @@ public class VirtualDeviceManagerService extends SystemService { } } } - return VirtualDeviceManager.DEFAULT_DEVICE_ID; + return VirtualDeviceManager.DEVICE_ID_DEFAULT; } @Nullable diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java index ded8179d765e..62ef52316f5b 100644 --- a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java @@ -16,8 +16,8 @@ package com.android.server.companion.virtual; -import static android.companion.virtual.VirtualDeviceManager.DEFAULT_DEVICE_ID; -import static android.companion.virtual.VirtualDeviceManager.INVALID_DEVICE_ID; +import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT; +import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_INVALID; import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM; import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT; import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS; @@ -322,13 +322,13 @@ public class VirtualDeviceManagerServiceTest { @Test public void getDeviceIdForDisplayId_invalidDisplayId_returnsDefault() { assertThat(mVdm.getDeviceIdForDisplayId(Display.INVALID_DISPLAY)) - .isEqualTo(DEFAULT_DEVICE_ID); + .isEqualTo(DEVICE_ID_DEFAULT); } @Test public void getDeviceIdForDisplayId_defaultDisplayId_returnsDefault() { assertThat(mVdm.getDeviceIdForDisplayId(Display.DEFAULT_DISPLAY)) - .isEqualTo(DEFAULT_DEVICE_ID); + .isEqualTo(DEVICE_ID_DEFAULT); } @Test @@ -336,7 +336,7 @@ public class VirtualDeviceManagerServiceTest { mDeviceImpl.mVirtualDisplayIds.remove(DISPLAY_ID); assertThat(mVdm.getDeviceIdForDisplayId(DISPLAY_ID)) - .isEqualTo(DEFAULT_DEVICE_ID); + .isEqualTo(DEVICE_ID_DEFAULT); } @Test @@ -349,13 +349,13 @@ public class VirtualDeviceManagerServiceTest { @Test public void getDevicePolicy_invalidDeviceId_returnsDefault() { - assertThat(mVdm.getDevicePolicy(INVALID_DEVICE_ID, POLICY_TYPE_SENSORS)) + assertThat(mVdm.getDevicePolicy(DEVICE_ID_INVALID, POLICY_TYPE_SENSORS)) .isEqualTo(DEVICE_POLICY_DEFAULT); } @Test public void getDevicePolicy_defaultDeviceId_returnsDefault() { - assertThat(mVdm.getDevicePolicy(DEFAULT_DEVICE_ID, POLICY_TYPE_SENSORS)) + assertThat(mVdm.getDevicePolicy(DEVICE_ID_DEFAULT, POLICY_TYPE_SENSORS)) .isEqualTo(DEVICE_POLICY_DEFAULT); } diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceTest.java index f6f13392ce3a..f47308637a9c 100644 --- a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceTest.java +++ b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceTest.java @@ -16,8 +16,8 @@ package com.android.server.companion.virtual; -import static android.companion.virtual.VirtualDeviceManager.DEFAULT_DEVICE_ID; -import static android.companion.virtual.VirtualDeviceManager.INVALID_DEVICE_ID; +import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT; +import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_INVALID; import static com.google.common.truth.Truth.assertThat; @@ -41,14 +41,14 @@ public class VirtualDeviceTest { public void build_invalidId_shouldThrowIllegalArgumentException() { assertThrows( IllegalArgumentException.class, - () -> new VirtualDevice(INVALID_DEVICE_ID, VIRTUAL_DEVICE_NAME)); + () -> new VirtualDevice(DEVICE_ID_INVALID, VIRTUAL_DEVICE_NAME)); } @Test public void build_defaultId_shouldThrowIllegalArgumentException() { assertThrows( IllegalArgumentException.class, - () -> new VirtualDevice(DEFAULT_DEVICE_ID, VIRTUAL_DEVICE_NAME)); + () -> new VirtualDevice(DEVICE_ID_DEFAULT, VIRTUAL_DEVICE_NAME)); } @Test |