Update ShadowNativeSQLiteConnection.nativeOpen to not ignore parameters

The parameters 'lookasideSlotSize' and 'lookasideSlotCount' were being unnecessarily ignored. Update ShadowNativeSQLiteConnection.nativeOpen methods to include them. PiperOrigin-RevId: 582043627
robolectric · Nov 13, 2023 · d2d6b77 · d2d6b77
1 parent 961385c
commit d2d6b77
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeSQLiteConnection.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeSQLiteConnection.java
@@ -23,19 +23,11 @@ public class ShadowNativeSQLiteConnection extends ShadowSQLiteConnection {
   @Implementation(maxSdk = O)
   protected static Number nativeOpen(
       String path, int openFlags, String label, boolean enableTrace, boolean enableProfile) {
-    DefaultNativeRuntimeLoader.injectAndLoad();
-    return PerfStatsCollector.getInstance()
-        .measure(
-            "androidsqlite",
-            () -> {
-              long result =
-                  SQLiteConnectionNatives.nativeOpen(
-                      path, openFlags, label, enableTrace, enableProfile, 0, 0);
-              if (RuntimeEnvironment.getApiLevel() < LOLLIPOP) {
-                return PreLPointers.register(result);
-              }
-              return result;
-            });
+    long result = nativeOpen(path, openFlags, label, enableTrace, enableProfile, 0, 0);
+    if (RuntimeEnvironment.getApiLevel() < LOLLIPOP) {
+      return PreLPointers.register(result);
+    }
+    return result;
   }
 
   @Implementation(minSdk = O_MR1)
@@ -47,7 +39,19 @@ protected static long nativeOpen(
       boolean enableProfile,
       int lookasideSlotSize,
       int lookasideSlotCount) {
-    return nativeOpen(path, openFlags, label, enableTrace, enableProfile).longValue();
+    DefaultNativeRuntimeLoader.injectAndLoad();
+    return PerfStatsCollector.getInstance()
+        .measure(
+            "androidsqlite",
+            () ->
+                SQLiteConnectionNatives.nativeOpen(
+                    path,
+                    openFlags,
+                    label,
+                    enableTrace,
+                    enableProfile,
+                    lookasideSlotSize,
+                    lookasideSlotCount));
   }
 
   @Implementation(maxSdk = KITKAT_WATCH)