SQLite Android Bindings
Check-in [7fbe992d8f]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge trunk with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | api-level-15
Files: files | file ages | folders
SHA1:7fbe992d8ff1cce48fe768d8e3501b04c32fd852
User & Date: dan 2014-06-11 19:10:57
Context
2014-06-18
10:14
Fix a resource leak in SQLiteConnection.nativeExecuteForCursorWindow(). check-in: 71351f6267 user: dan tags: api-level-15
2014-06-11
19:10
Merge trunk with this branch. check-in: 7fbe992d8f user: dan tags: api-level-15
18:59
Changes so that package names always match paths on disk, as required by eclipse. check-in: c93d2517dc user: dan tags: trunk
2014-05-21
18:17
Merge documentation updates with this branch. check-in: 49c7a766e1 user: dan tags: api-level-15
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Name change from src/org/sqlite/database/sqlite/ExtraUtils.java to src/org/sqlite/database/ExtraUtils.java.

Changes to src/org/sqlite/database/sqlite/CloseGuard.java.

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
 * limitations under the License.
 */
/*
** Modified to support SQLite extensions by the SQLite developers: 
** sqlite-dev@sqlite.org.
*/

package dalvik.system;
import android.util.Log;

/**
 * CloseGuard is a mechanism for flagging implicit finalizer cleanup of
 * resources that should have been cleaned up by explicit close
 * methods (aka "explicit termination methods" in Effective Java).
 * <p>







|







14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
 * limitations under the License.
 */
/*
** Modified to support SQLite extensions by the SQLite developers: 
** sqlite-dev@sqlite.org.
*/

package org.sqlite.database.sqlite;
import android.util.Log;

/**
 * CloseGuard is a mechanism for flagging implicit finalizer cleanup of
 * resources that should have been cleaned up by explicit close
 * methods (aka "explicit termination methods" in Effective Java).
 * <p>

Changes to src/org/sqlite/database/sqlite/SQLiteConnection.java.

17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
** Modified to support SQLite extensions by the SQLite developers: 
** sqlite-dev@sqlite.org.
*/

package org.sqlite.database.sqlite;

/* import dalvik.system.BlockGuard; */
import dalvik.system.CloseGuard;

import android.database.Cursor;
import android.database.CursorWindow;
import android.database.DatabaseUtils;
import org.sqlite.database.ExtraUtils;
import org.sqlite.database.sqlite.SQLiteDebug.DbStats;
import org.sqlite.os.CancellationSignal;







|







17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
** Modified to support SQLite extensions by the SQLite developers: 
** sqlite-dev@sqlite.org.
*/

package org.sqlite.database.sqlite;

/* import dalvik.system.BlockGuard; */
import org.sqlite.database.sqlite.CloseGuard;

import android.database.Cursor;
import android.database.CursorWindow;
import android.database.DatabaseUtils;
import org.sqlite.database.ExtraUtils;
import org.sqlite.database.sqlite.SQLiteDebug.DbStats;
import org.sqlite.os.CancellationSignal;

Changes to src/org/sqlite/database/sqlite/SQLiteConnectionPool.java.

16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
/*
** Modified to support SQLite extensions by the SQLite developers: 
** sqlite-dev@sqlite.org.
*/

package org.sqlite.database.sqlite;

import dalvik.system.CloseGuard;

import org.sqlite.database.sqlite.SQLiteDebug.DbStats;
import org.sqlite.os.CancellationSignal;
import org.sqlite.os.OperationCanceledException;
import android.os.SystemClock;
import android.util.Log;
/* import android.util.PrefixPrinter; */







|







16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
/*
** Modified to support SQLite extensions by the SQLite developers: 
** sqlite-dev@sqlite.org.
*/

package org.sqlite.database.sqlite;

import org.sqlite.database.sqlite.CloseGuard;

import org.sqlite.database.sqlite.SQLiteDebug.DbStats;
import org.sqlite.os.CancellationSignal;
import org.sqlite.os.OperationCanceledException;
import android.os.SystemClock;
import android.util.Log;
/* import android.util.PrefixPrinter; */

Changes to src/org/sqlite/database/sqlite/SQLiteDatabase.java.

33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
import org.sqlite.os.OperationCanceledException;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log;
import android.util.Pair;
import android.util.Printer;

import dalvik.system.CloseGuard;

import java.io.File;
import java.io.FileFilter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;







|







33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
import org.sqlite.os.OperationCanceledException;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log;
import android.util.Pair;
import android.util.Printer;

import org.sqlite.database.sqlite.CloseGuard;

import java.io.File;
import java.io.FileFilter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;