am 4e68024c: am 1e48b386: am 04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"

# By Niklas Brunlid
# Via Android Git Automerger (2) and others
* commit '4e68024c7e9cf5849bc7c57266b0079113a2562f':
  Keep native callbacks when primary SQLiteConnection is recreated

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java
index b2b6106..0017c46 100644
--- a/core/java/android/database/sqlite/SQLiteConnection.java
+++ b/core/java/android/database/sqlite/SQLiteConnection.java
@@ -216,6 +216,13 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
         setJournalSizeLimit();
         setAutoCheckpointInterval();
         setLocaleFromConfiguration();
+
+        // Register custom functions.
+        final int functionCount = mConfiguration.customFunctions.size();
+        for (int i = 0; i < functionCount; i++) {
+            SQLiteCustomFunction function = mConfiguration.customFunctions.get(i);
+            nativeRegisterCustomFunction(mConnectionPtr, function);
+        }
     }
 
     private void dispose(boolean finalized) {