From 254fba8960b018a29c5fe422b8a0fd9eeedbf3e4 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Thu, 19 Jan 2012 17:06:44 -0800
Subject: Clean up SQLiteDebug natives.

In particular, ensure that the database is initialized.

Change-Id: Ifa69a9dfa9d008af79beadbd1a25e90d0d29e66c
---
 core/java/android/database/sqlite/SQLiteDebug.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'core/java/android/database/sqlite')

diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java
index 3ef9b49..95350ba 100644
--- a/core/java/android/database/sqlite/SQLiteDebug.java
+++ b/core/java/android/database/sqlite/SQLiteDebug.java
@@ -29,6 +29,8 @@ import android.util.Printer;
  * {@hide}
  */
 public final class SQLiteDebug {
+    private static native void nativeGetPagerStats(PagerStats stats);
+
     /**
      * Controls the printing of informational SQL log messages.
      */
@@ -73,7 +75,7 @@ public final class SQLiteDebug {
     /**
      * Contains statistics about the active pagers in the current process.
      *
-     * @see #getPagerStats(PagerStats)
+     * @see #nativeGetPagerStats(PagerStats)
      */
     public static class PagerStats {
         /** the current amount of memory checked out by sqlite using sqlite3_malloc().
@@ -136,7 +138,8 @@ public final class SQLiteDebug {
      */
     public static PagerStats getDatabaseInfo() {
         PagerStats stats = new PagerStats();
-        getPagerStats(stats);
+        SQLiteGlobal.initializeOnce();
+        nativeGetPagerStats(stats);
         stats.dbStats = SQLiteDatabase.getDbStats();
         return stats;
     }
@@ -156,9 +159,4 @@ public final class SQLiteDebug {
 
         SQLiteDatabase.dumpAll(printer, verbose);
     }
-
-    /**
-     * Gathers statistics about all pagers in the current process.
-     */
-    public static native void getPagerStats(PagerStats stats);
 }
-- 
cgit v1.1