From 860215415578e54ff029234a281f72eb1ba2d71e 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/5136>
---
 .../gst-plugins-bad/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 a8497c6..c2f79b6 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
@@ -979,6 +979,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.EFFECT_EMBOSS = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1000,6 +1001,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.EFFECT_SKETCH = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1021,6 +1023,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.EFFECT_NEON = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1519,6 +1522,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_BACKLIGHT = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1540,6 +1544,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_FLOWERS = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1561,6 +1566,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_AR = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
@@ -1582,6 +1588,7 @@ _init_classes (void)
     }
   } else {
     android_hardware_camera_parameters.SCENE_MODE_HDR = NULL;
+    g_clear_error (&err);
   }
 
   fieldID =
-- 
2.7.4