Simplify --list-cameras output

Remove --video-source=camera from the output of --list-cameras (this is implicit).
Return the FakeContext as application context
2023-11-05 21:44:33 +01:00 · 2023-11-03 19:07:15 +01:00 · 2023-11-03 19:07:08 +01:00 · 2023-11-03 19:05:50 +01:00 · 2023-11-03 19:05:28 +01:00
2 changed files with 7 additions and 1 deletions
--- a/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
+++ b/server/src/main/java/com/genymobile/scrcpy/FakeContext.java
@@ -2,6 +2,7 @@ package com.genymobile.scrcpy;

 import android.annotation.TargetApi;
 import android.content.AttributionSource;
+import android.content.Context;
 import android.content.ContextWrapper;
 import android.os.Build;
 import android.os.Process;
@@ -44,4 +45,9 @@ public final class FakeContext extends ContextWrapper {
    public int getDeviceId() {
        return 0;
    }
+
+    @Override
+    public Context getApplicationContext() {
+        return this;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
@@ -93,7 +93,7 @@ public final class LogUtils {
                builder.append("\n    (none)");
            } else {
                for (String id : cameraIds) {
-                    builder.append("\n    --video-source=camera --camera-id=").append(id);
+                    builder.append("\n    --camera-id=").append(id);
                    CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(id);

                    int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
Author	SHA1	Message	Date
Romain Vimont	ccaa832f48	Simplify --list-cameras output Remove --video-source=camera from the output of --list-cameras (this is implicit).	2023-11-05 21:44:33 +01:00
Romain Vimont	4e4ddc499f	Return the FakeContext as application context This avoids getApplicationContext() to return null and cause NullPointerException. Fixes #4392 <https://github.com/Genymobile/scrcpy/issues/4392#issuecomment-1792806080>	2023-11-03 19:07:15 +01:00
Romain Vimont	8d76b3e06d	Fill application context for camera Using the camera fails on some devices without a proper application context. Fixes #4392 <https://github.com/Genymobile/scrcpy/issues/4392>	2023-11-03 19:07:08 +01:00
Romain Vimont	85a0b935c9	Always assign a system context as base context FakeContext used ActivityThread.getSystemContext() as base context only in some cases, because it caused problems on some devices: - warnings on Xiaomi devices [1], which are now fixed by `b8c5853aa6` - issues related to Looper [2], which are solved by just calling Looper.prepare*() Therefore, we can now always assign a base context, which simplifies and helps to solve camera issues on some devices (#4392). [1] <https://github.com/Genymobile/scrcpy/issues/4015#issuecomment-1595382142> [2] <https://github.com/Genymobile/scrcpy/issues/3805#issuecomment-1596148031> Fixes #4392 <https://github.com/Genymobile/scrcpy/issues/4392>	2023-11-03 19:05:50 +01:00
Romain Vimont	8c3e2bae7b	Simplify Application instantiation The constructor is public.	2023-11-03 19:05:28 +01:00