Merge "Inline getVirtualDisplayName into deprecated API"
diff --git a/core/java/android/companion/virtual/VirtualDeviceManager.java b/core/java/android/companion/virtual/VirtualDeviceManager.java
index 90681cb..a6ac151 100644
--- a/core/java/android/companion/virtual/VirtualDeviceManager.java
+++ b/core/java/android/companion/virtual/VirtualDeviceManager.java
@@ -545,8 +545,13 @@
@VirtualDisplayFlag int flags,
@Nullable @CallbackExecutor Executor executor,
@Nullable VirtualDisplay.Callback callback) {
+ // Currently this just use the device ID, which means all of the virtual displays
+ // created using the same virtual device will have the same name if they use this
+ // deprecated API. The name should only be used for informational purposes, and not for
+ // identifying the display in code.
+ String virtualDisplayName = "VirtualDevice_" + getDeviceId();
VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder(
- getVirtualDisplayName(), width, height, densityDpi)
+ virtualDisplayName, width, height, densityDpi)
.setFlags(flags);
if (surface != null) {
builder.setSurface(surface);
@@ -858,18 +863,6 @@
}
}
- private String getVirtualDisplayName() {
- try {
- // Currently this just use the device ID, which means all of the virtual displays
- // created using the same virtual device will have the same name. The name should
- // only be used for informational purposes, and not for identifying the display in
- // code.
- return "VirtualDevice_" + mVirtualDevice.getDeviceId();
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
- }
-
/**
* Adds an activity listener to listen for events such as top activity change or virtual
* display task stack became empty.