Accept cameraName as String

packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/features/resolution/ResolutionFeature.java

@@ -30,14 +30,18 @@ public class ResolutionFeature extends CameraFeature<ResolutionPreset> {
    *
    * @param cameraProperties Collection of characteristics for the current camera device.
    * @param resolutionPreset Platform agnostic enum containing resolution information.
-   * @param cameraId Camera identifier of the camera for which to configure the resolution.
+   * @param cameraName Camera identifier of the camera for which to configure the resolution.
    */
   public ResolutionFeature(
-      CameraProperties cameraProperties, ResolutionPreset resolutionPreset, int cameraId) {
+      CameraProperties cameraProperties, ResolutionPreset resolutionPreset, String cameraName) {
     super(cameraProperties);
     this.currentSetting = resolutionPreset;
-    this.cameraId = cameraId;
-
+    try {
+      this.cameraId = Integer.parseInt(cameraName, 10);
+    } catch (NumberFormatException e) {
+      this.cameraId = -1;
+      return;
+    }
     configureResolution(resolutionPreset, cameraId);
   }
 
@@ -54,9 +58,13 @@ public ResolutionFeature(
    */
   public static CamcorderProfile getBestAvailableCamcorderProfileForResolutionPreset(
       int cameraId, ResolutionPreset preset) {
+    if (cameraId < 0) {
+      throw new AssertionError(
+          "getBestAvailableCamcorderProfileForResolutionPreset can only be used with valid (>=0) camera identifiers.");
+    }
 
     switch (preset) {
-        // All of these cases deliberately fall through to get the best available profile.
+      // All of these cases deliberately fall through to get the best available profile.
       case max:
         if (CamcorderProfile.hasProfile(cameraId, CamcorderProfile.QUALITY_HIGH)) {
           return CamcorderProfile.get(cameraId, CamcorderProfile.QUALITY_HIGH);
@@ -103,6 +111,9 @@ static Size computeBestPreviewSize(int cameraId, ResolutionPreset preset) {
   }
 
   private void configureResolution(ResolutionPreset resolutionPreset, int cameraId) {
+    if (!checkIsSupported()) {
+      return;
+    }
     recordingProfile =
         getBestAvailableCamcorderProfileForResolutionPreset(cameraId, resolutionPreset);
     captureSize = new Size(recordingProfile.videoFrameWidth, recordingProfile.videoFrameHeight);
@@ -128,7 +139,7 @@ public void setValue(ResolutionPreset value) {
   // Always supported
   @Override
   public boolean checkIsSupported() {
-    return true;
+    return cameraId >= 0;
   }
 
   @Override
@@ -163,4 +174,4 @@ public Size getPreviewSize() {
   public Size getCaptureSize() {
     return this.captureSize;
   }
-}
+}

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/features/resolution/ResolutionFeatureTest.java

@@ -17,7 +17,7 @@
 import org.mockito.MockedStatic;
 
 public class ResolutionFeatureTest {
-  private static final int cameraId = 1;
+  private static final String cameraName = "1";
   private CamcorderProfile mockProfileLow;
   private MockedStatic<CamcorderProfile> mockedStaticProfile;
 
@@ -82,7 +82,7 @@ public void after() {
   public void getDebugName_should_return_the_name_of_the_feature() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     assertEquals("ResolutionFeature", resolutionFeature.getDebugName());
   }
@@ -91,7 +91,7 @@ public void getDebugName_should_return_the_name_of_the_feature() {
   public void getValue_should_return_initial_value_when_not_set() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     assertEquals(ResolutionPreset.max, resolutionFeature.getValue());
   }
@@ -100,7 +100,7 @@ public void getValue_should_return_initial_value_when_not_set() {
   public void getValue_should_echo_setValue() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     resolutionFeature.setValue(ResolutionPreset.high);
 
@@ -111,7 +111,7 @@ public void getValue_should_echo_setValue() {
   public void checkIsSupport_returns_true() {
     CameraProperties mockCameraProperties = mock(CameraProperties.class);
     ResolutionFeature resolutionFeature =
-        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraId);
+        new ResolutionFeature(mockCameraProperties, ResolutionPreset.max, cameraName);
 
     assertTrue(resolutionFeature.checkIsSupported());
   }
@@ -187,4 +187,4 @@ public void computeBestPreviewSize_should_use_QVGA_when_resolution_preset_low()
 
     mockedStaticProfile.verify(() -> CamcorderProfile.get(1, CamcorderProfile.QUALITY_QVGA));
   }
-}
+}