From ec201c657740bae252ad8b748d1f84a8b5d55de4 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Wed, 19 Jul 2023 18:08:16 -0500
Subject: [PATCH] androidmedia: Clear err if we don't have an optional camera
 field/constant

Fixes startup on devices where those fields/constants are not found.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5130>
---
 .../sys/androidmedia/gst-android-hardware-camera.c         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/subprojects/gst-plugins-bad/sys/androidmedia/gst-android-hardware-camera.c b/subprojects/gst-plugins-bad/sys/androidmedia/gst-android-hardware-camera.c
index f8fd74498d..0b6b04b2e0 100644
--- a/subprojects/gst-plugins-bad/sys/androidmedia/gst-android-hardware-camera.c
+++ b/subprojects/gst-plugins-bad/sys/androidmedia/gst-android-hardware-camera.c
@@ -988,6 +988,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.EFFECT_EMBOSS = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1009,6 +1010,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.EFFECT_SKETCH = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1030,6 +1032,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.EFFECT_NEON = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1528,6 +1531,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_BACKLIGHT = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1549,6 +1553,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_FLOWERS = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1570,6 +1575,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_AR = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1591,6 +1597,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_HDR = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =