Merge "Allow for multiple internal and external viewports." (94b76b22) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayManagerService.java

+12 −18

Original line number	Diff line number	Diff line
		@@ -1423,17 +1423,18 @@ public final class DisplayManagerService extends SystemService {

		private Optional<Integer> getViewportType(DisplayDeviceInfo info) {
		// Get the corresponding viewport type.
		if ((info.flags & DisplayDeviceInfo.FLAG_DEFAULT_DISPLAY) != 0) {
		switch (info.touch) {
		case DisplayDeviceInfo.TOUCH_INTERNAL:
		return Optional.of(VIEWPORT_INTERNAL);
		} else if (info.touch == DisplayDeviceInfo.TOUCH_EXTERNAL) {
		case DisplayDeviceInfo.TOUCH_EXTERNAL:
		return Optional.of(VIEWPORT_EXTERNAL);
		} else if (info.touch == DisplayDeviceInfo.TOUCH_VIRTUAL
		&& !TextUtils.isEmpty(info.uniqueId)) {
		case DisplayDeviceInfo.TOUCH_VIRTUAL:
		if (!TextUtils.isEmpty(info.uniqueId)) {
		return Optional.of(VIEWPORT_VIRTUAL);
		} else {
		if (DEBUG) {
		Slog.i(TAG, "Display " + info + " does not support input device matching.");
		}
		// fallthrough
		default:
		Slog.w(TAG, "Display " + info + " does not support input device matching.");
		}
		return Optional.empty();
		}
		@@ -1483,13 +1484,6 @@ public final class DisplayManagerService extends SystemService {
		return null;
		}

		// Only allow a single INTERNAL or EXTERNAL viewport by forcing their uniqueIds
		// to be identical (in particular, empty).
		// TODO (b/116824030) allow multiple EXTERNAL viewports and remove this function.
		if (viewportType != VIEWPORT_VIRTUAL) {
		uniqueId = "";
		}

		DisplayViewport viewport;
		final int count = mViewports.size();
		for (int i = 0; i < count; i++) {