[camerax] Explicitly remove READ_EXTERNAL_STORAGE permission

.github/workflows/scorecards-analysis.yml

@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@a09933a12a80f87b87005513f0abb1494c27a716 # v1.0.26
+        uses: github/codeql-action/upload-sarif@5b6282e01c62d02e720b81eb8a51204f527c3624 # v1.0.26
         with:
           sarif_file: results.sarif

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.5.0+14
 
-* Wraps classes needed to implement resolution configuration for video recording.
+* Explicitly removes `READ_EXTERNAL_STORAGE` permission that may otherwise be implied from `WRITE_EXTERNAL_STORAGE`.
 
 ## 0.5.0+13
 

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraAndroidCameraxPlugin.java

@@ -103,10 +103,6 @@ public void setUp(
         binaryMessenger, new ResolutionStrategyHostApiImpl(instanceManager));
     GeneratedCameraXLibrary.AspectRatioStrategyHostApi.setup(
         binaryMessenger, new AspectRatioStrategyHostApiImpl(instanceManager));
-    GeneratedCameraXLibrary.FallbackStrategyHostApi.setup(
-        binaryMessenger, new FallbackStrategyHostApiImpl(instanceManager));
-    GeneratedCameraXLibrary.QualitySelectorHostApi.setup(
-        binaryMessenger, new QualitySelectorHostApiImpl(instanceManager));
   }
 
   @Override

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/GeneratedCameraXLibrary.java

@@ -104,43 +104,6 @@ private LiveDataSupportedType(final int index) {
     }
   }
 
-  /**
-   * Video quality constraints that will be used by a QualitySelector to choose an appropriate video
-   * resolution.
-   *
-   * <p>These are pre-defined quality constants that are universally used for video.
-   *
-   * <p>See https://developer.android.com/reference/androidx/camera/video/Quality.
-   */
-  public enum VideoQualityConstraint {
-    SD(0),
-    HD(1),
-    FHD(2),
-    UHD(3),
-    LOWEST(4),
-    HIGHEST(5);
-
-    final int index;
-
-    private VideoQualityConstraint(final int index) {
-      this.index = index;
-    }
-  }
-
-  /** Fallback rules for selecting video resolution. */
-  public enum VideoResolutionFallbackRule {
-    HIGHER_QUALITY_OR_LOWER_THAN(0),
-    HIGHER_QUALITY_THAN(1),
-    LOWER_QUALITY_OR_HIGHER_THAN(2),
-    LOWER_QUALITY_THAN(3);
-
-    final int index;
-
-    private VideoResolutionFallbackRule(final int index) {
-      this.index = index;
-    }
-  }
-
   /** Generated class from Pigeon that represents data sent in messages. */
   public static final class ResolutionInfo {
     private @NonNull Long width;
@@ -1593,11 +1556,7 @@ public void create(@NonNull Long identifierArg, @NonNull Reply<Void> callback) {
   /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
   public interface RecorderHostApi {
 
-    void create(
-        @NonNull Long identifier,
-        @Nullable Long aspectRatio,
-        @Nullable Long bitRate,
-        @Nullable Long qualitySelectorId);
+    void create(@NonNull Long identifier, @Nullable Long aspectRatio, @Nullable Long bitRate);
 
     @NonNull
     Long getAspectRatio(@NonNull Long identifier);
@@ -1628,13 +1587,11 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable RecorderHo
                 Number identifierArg = (Number) args.get(0);
                 Number aspectRatioArg = (Number) args.get(1);
                 Number bitRateArg = (Number) args.get(2);
-                Number qualitySelectorIdArg = (Number) args.get(3);
                 try {
                   api.create(
                       (identifierArg == null) ? null : identifierArg.longValue(),
                       (aspectRatioArg == null) ? null : aspectRatioArg.longValue(),
-                      (bitRateArg == null) ? null : bitRateArg.longValue(),
-                      (qualitySelectorIdArg == null) ? null : qualitySelectorIdArg.longValue());
+                      (bitRateArg == null) ? null : bitRateArg.longValue());
                   wrapped.add(0, null);
                 } catch (Throwable exception) {
                   ArrayList<Object> wrappedError = wrapError(exception);
@@ -2980,165 +2937,4 @@ public void create(
           channelReply -> callback.reply(null));
     }
   }
-
-  private static class QualitySelectorHostApiCodec extends StandardMessageCodec {
-    public static final QualitySelectorHostApiCodec INSTANCE = new QualitySelectorHostApiCodec();
-
-    private QualitySelectorHostApiCodec() {}
-
-    @Override
-    protected Object readValueOfType(byte type, @NonNull ByteBuffer buffer) {
-      switch (type) {
-        case (byte) 128:
-          return ResolutionInfo.fromList((ArrayList<Object>) readValue(buffer));
-        default:
-          return super.readValueOfType(type, buffer);
-      }
-    }
-
-    @Override
-    protected void writeValue(@NonNull ByteArrayOutputStream stream, Object value) {
-      if (value instanceof ResolutionInfo) {
-        stream.write(128);
-        writeValue(stream, ((ResolutionInfo) value).toList());
-      } else {
-        super.writeValue(stream, value);
-      }
-    }
-  }
-
-  /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-  public interface QualitySelectorHostApi {
-
-    void create(
-        @NonNull Long identifier,
-        @NonNull List<Long> videoQualityConstraintIndexList,
-        @Nullable Long fallbackStrategyId);
-
-    @NonNull
-    ResolutionInfo getResolution(
-        @NonNull Long cameraInfoId, @NonNull VideoQualityConstraint quality);
-
-    /** The codec used by QualitySelectorHostApi. */
-    static @NonNull MessageCodec<Object> getCodec() {
-      return QualitySelectorHostApiCodec.INSTANCE;
-    }
-    /**
-     * Sets up an instance of `QualitySelectorHostApi` to handle messages through the
-     * `binaryMessenger`.
-     */
-    static void setup(
-        @NonNull BinaryMessenger binaryMessenger, @Nullable QualitySelectorHostApi api) {
-      {
-        BasicMessageChannel<Object> channel =
-            new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.QualitySelectorHostApi.create", getCodec());
-        if (api != null) {
-          channel.setMessageHandler(
-              (message, reply) -> {
-                ArrayList<Object> wrapped = new ArrayList<Object>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                Number identifierArg = (Number) args.get(0);
-                List<Long> videoQualityConstraintIndexListArg = (List<Long>) args.get(1);
-                Number fallbackStrategyIdArg = (Number) args.get(2);
-                try {
-                  api.create(
-                      (identifierArg == null) ? null : identifierArg.longValue(),
-                      videoQualityConstraintIndexListArg,
-                      (fallbackStrategyIdArg == null) ? null : fallbackStrategyIdArg.longValue());
-                  wrapped.add(0, null);
-                } catch (Throwable exception) {
-                  ArrayList<Object> wrappedError = wrapError(exception);
-                  wrapped = wrappedError;
-                }
-                reply.reply(wrapped);
-              });
-        } else {
-          channel.setMessageHandler(null);
-        }
-      }
-      {
-        BasicMessageChannel<Object> channel =
-            new BasicMessageChannel<>(
-                binaryMessenger,
-                "dev.flutter.pigeon.QualitySelectorHostApi.getResolution",
-                getCodec());
-        if (api != null) {
-          channel.setMessageHandler(
-              (message, reply) -> {
-                ArrayList<Object> wrapped = new ArrayList<Object>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                Number cameraInfoIdArg = (Number) args.get(0);
-                VideoQualityConstraint qualityArg =
-                    args.get(1) == null ? null : VideoQualityConstraint.values()[(int) args.get(1)];
-                try {
-                  ResolutionInfo output =
-                      api.getResolution(
-                          (cameraInfoIdArg == null) ? null : cameraInfoIdArg.longValue(),
-                          qualityArg);
-                  wrapped.add(0, output);
-                } catch (Throwable exception) {
-                  ArrayList<Object> wrappedError = wrapError(exception);
-                  wrapped = wrappedError;
-                }
-                reply.reply(wrapped);
-              });
-        } else {
-          channel.setMessageHandler(null);
-        }
-      }
-    }
-  }
-  /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-  public interface FallbackStrategyHostApi {
-
-    void create(
-        @NonNull Long identifier,
-        @NonNull VideoQualityConstraint quality,
-        @NonNull VideoResolutionFallbackRule fallbackRule);
-
-    /** The codec used by FallbackStrategyHostApi. */
-    static @NonNull MessageCodec<Object> getCodec() {
-      return new StandardMessageCodec();
-    }
-    /**
-     * Sets up an instance of `FallbackStrategyHostApi` to handle messages through the
-     * `binaryMessenger`.
-     */
-    static void setup(
-        @NonNull BinaryMessenger binaryMessenger, @Nullable FallbackStrategyHostApi api) {
-      {
-        BasicMessageChannel<Object> channel =
-            new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.FallbackStrategyHostApi.create", getCodec());
-        if (api != null) {
-          channel.setMessageHandler(
-              (message, reply) -> {
-                ArrayList<Object> wrapped = new ArrayList<Object>();
-                ArrayList<Object> args = (ArrayList<Object>) message;
-                Number identifierArg = (Number) args.get(0);
-                VideoQualityConstraint qualityArg =
-                    args.get(1) == null ? null : VideoQualityConstraint.values()[(int) args.get(1)];
-                VideoResolutionFallbackRule fallbackRuleArg =
-                    args.get(2) == null
-                        ? null
-                        : VideoResolutionFallbackRule.values()[(int) args.get(2)];
-                try {
-                  api.create(
-                      (identifierArg == null) ? null : identifierArg.longValue(),
-                      qualityArg,
-                      fallbackRuleArg);
-                  wrapped.add(0, null);
-                } catch (Throwable exception) {
-                  ArrayList<Object> wrappedError = wrapError(exception);
-                  wrapped = wrappedError;
-                }
-                reply.reply(wrapped);
-              });
-        } else {
-          channel.setMessageHandler(null);
-        }
-      }
-    }
-  }
 }