Merge "Inline getVirtualDisplayName into deprecated API" (22b17140) · Commits · e / os / android_frameworks_base

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

+6 −13

Original line number	Diff line number	Diff line
		@@ -545,8 +545,13 @@ public final class VirtualDeviceManager {
		@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 @@ public final class VirtualDeviceManager {
		}
		}

		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.