Set an ApplicationContext

server/src/main/java/com/genymobile/scrcpy/LogUtils.java

@@ -3,17 +3,14 @@ package com.genymobile.scrcpy;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
-import android.annotation.TargetApi;
 import android.graphics.Rect;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.MediaCodec;
-import android.os.Build;
 import android.util.Range;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -87,7 +84,6 @@ public final class LogUtils {
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.P)
     public static String buildCameraListMessage(boolean includeSizes) {
         StringBuilder builder = new StringBuilder("List of cameras:");
         CameraManager cameraManager = ServiceManager.getCameraManager();
@@ -97,7 +93,7 @@ public final class LogUtils {
                 builder.append("\n    (none)");
             } else {
                 for (String id : cameraIds) {
-                    builder.append("\n    --camera-id=").append(id);
+                    builder.append("\n    --video-source=camera --camera-id=").append(id);
                     CameraCharacteristics characteristics = cameraManager.getCameraCharacteristics(id);
 
                     int facing = characteristics.get(CameraCharacteristics.LENS_FACING);
@@ -111,15 +107,6 @@ public final class LogUtils {
                     SortedSet<Integer> uniqueLowFps = getUniqueSet(lowFpsRanges);
                     builder.append("fps=").append(uniqueLowFps).append(')');
 
-                    int[] capabilities = characteristics.get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
-                    if (Arrays.asList(capabilities).contains(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA)) {
-                        builder.append("\n        Logical multi-camera, backed by physical cameras:");
-                        for (String phyId : characteristics.getPhysicalCameraIds()) {
-                            CameraCharacteristics phyCharacteristics = cameraManager.getCameraCharacteristics(phyId);
-                            appendPhysicalCamera(builder, phyId, phyCharacteristics);
-                        }
-                    }
-
                     if (includeSizes) {
                         StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
 
@@ -147,13 +134,6 @@ public final class LogUtils {
         return builder.toString();
     }
 
-    private static void appendPhysicalCamera(StringBuilder builder, String id, CameraCharacteristics characteristics) {
-        builder.append("\n            --camera-id=").append(id).append("    (");
-
-        Rect activeSize = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-        builder.append(activeSize.width()).append("x").append(activeSize.height()).append(")");
-    }
-
     private static SortedSet<Integer> getUniqueSet(Range<Integer>[] ranges) {
         SortedSet<Integer> set = new TreeSet<>();
         for (Range<Integer> range : ranges) {