InputService: make takeScreenShots() display-specific

Author: bk138

app/src/main/java/net/christianbeier/droidvnc_ng/InputService.java

@@ -690,7 +690,7 @@ public static void onCutText(String text, long client) {
 	}
 
 	@RequiresApi(api = Build.VERSION_CODES.R)
-	public static void takeScreenShots(boolean enable) {
+	public static void takeScreenShots(boolean enable, int displayId) {
 		try {
 			if (enable) {
 				instance.mTakeScreenShotCallback = new TakeScreenshotCallback() {
@@ -725,7 +725,7 @@ public void onSuccess(@NonNull ScreenshotResult screenshot) {
 								instance.mMainHandler.postDelayed(() ->
 										{
 											try {
-												instance.takeScreenshot(Display.DEFAULT_DISPLAY,
+												instance.takeScreenshot(displayId,
 														instance.getMainExecutor(),
 														this);
 											} catch (Exception ignored) {
@@ -749,7 +749,7 @@ public void onFailure(int errorCode) {
 								// try again later, incrementing delay
 								instance.mMainHandler.postDelayed(() -> {
 									try {
-										instance.takeScreenshot(Display.DEFAULT_DISPLAY,
+										instance.takeScreenshot(displayId,
 												instance.getMainExecutor(),
 												this
 										);
@@ -771,7 +771,7 @@ public void onFailure(int errorCode) {
 
 				// first screenshot
 				Log.d(TAG, "takeScreenShots: start");
-				instance.takeScreenshot(Display.DEFAULT_DISPLAY,
+				instance.takeScreenshot(displayId,
 						instance.getMainExecutor(),
 						instance.mTakeScreenShotCallback
 				);

app/src/main/java/net/christianbeier/droidvnc_ng/MainService.java

@@ -737,7 +737,7 @@ private void startScreenCapture() {
         } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 Log.d(TAG, "startScreenCapture: trying takeScreenShot backend");
-                InputService.takeScreenShots(true);
+                InputService.takeScreenShots(true, Display.DEFAULT_DISPLAY);
             } else {
                 Log.w(TAG, "startScreenCapture: no backend available");
             }
@@ -748,7 +748,7 @@ private void stopScreenCapture() {
         // stop all backends unconditionally
         stopService(new Intent(this, MediaProjectionService.class));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            InputService.takeScreenShots(false);
+            InputService.takeScreenShots(false, Display.DEFAULT_DISPLAY);
         }
     }