Merge conflicts

CHANGELOG.md

@@ -4,6 +4,12 @@
 * [iOS] Fix bug in iOS *Polygon Geofencing* when running in geofences-only mode (`.startGeofences`).  iOS would mistakenly turn off location updates exactly 3 samples into the containing circular geofence of a polygon.
 * Implement `notifyOnDwell` for polygon-geofences.
 
+## 4.16.5 — 2024-07-12 
+* [Android][Expo] Conditionally add polygonLicense only if provided in Config.  Do not write to AndroidManifest unless provided.
+
+## 4.16.4 — 2024-07-08
+* [Android][Expo] Implement polygonLicense Config option
+
 ## 4.16.3 — 2024-06-12
 * [Android] Remove permission `FOREGROUND_SERVICE_HEALTH`.  It turns out that this permission is no longer required whe
 n the `ActivityRecognitionServivce` is defined with a `foregroundServiceType="shortservice"`, instead of `"health"`, which allows a background

expo/plugin/src/androidPlugin.ts

@@ -98,11 +98,13 @@ const androidPlugin: ConfigPlugin<Props> = (config, props={}) => {
       META_HMS_LICENSE_KEY,
       props.hmsLicense || "UNDEFINED"
     );
-    addMetaDataItemToMainApplication(
-      mainApplication,
-      META_POLYGON_LICENSE_KEY,
-      props.polygonLicense || "UNDEFINED"
-    );
+    if (props.polygonLicense) {
+      addMetaDataItemToMainApplication(
+        mainApplication,
+        META_POLYGON_LICENSE_KEY,
+        props.polygonLicense
+      );
+    }
     return config;
 
   });