Jean-Baptiste Queru
1a2344b8b2
am 09e50cdb: Merge "Reorder lock acquision vs try."
...
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
Reorder lock acquision vs try.
2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
09e50cdbc6
Merge "Reorder lock acquision vs try."
2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
f4072fcc14
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
...
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
2010-11-17 16:47:59 -08:00
Jonas Schwertfeger
8402903723
Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
...
The signatures of the existing buildQuery and buildUnionSubQuery methods include a selectionArgs
parameter that is not actually being used in the method implementations. This parameter leads
to the misconception that SQL paramter substitution is carried out by these methods. I added
new variants of these methods without that parameter and deprecated the old variants.
Change-Id: I1bf770d5c777649e9aac36d93aa93bd65bbcc2a3
2010-11-12 12:18:37 +01:00
Jean-Baptiste Queru
c91e46730d
am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
...
* commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
Document per-implementation behaviors of native get* methods
2010-11-02 14:18:07 -07:00
Jean-Baptiste Queru
0b5d57ab7e
am 715f8610: Merge "Clarify documentation of Cursor get* methods."
...
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
Clarify documentation of Cursor get* methods.
2010-11-02 14:18:02 -07:00
Daniel Trebbien
adf4194458
Document per-implementation behaviors of native get* methods
...
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
2010-11-02 09:35:12 -07:00
Daniel Trebbien
65068b099e
Clarify documentation of Cursor get* methods.
...
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.
Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
2010-11-02 09:24:07 -07:00
Daniel Trebbien
38767b34ba
Reorder lock acquision vs try.
...
In two places involving locking, reordered the code so that the lock
acquisition is performed outside of the `try` block and everything
else that needs to run while the lock is locked *within* the `try`
block.
Change-Id: I3dad2c4bbf60b219fc6db2aa35e2ed296cb39128
2010-11-01 14:13:56 -07:00
Brad Fitzpatrick
6718b365bc
am 32e60c79: Update StrictMode\'s public API.
...
Merge commit '32e60c7942eeba920ec5c27b372ec0899fd75a20' into gingerbread-plus-aosp
* commit '32e60c7942eeba920ec5c27b372ec0899fd75a20':
Update StrictMode's public API.
2010-10-01 13:05:02 -07:00
Brad Fitzpatrick
32e60c7942
Update StrictMode's public API.
...
This makes it more future-proof and maintainable, not exposing the
internal bitpacking state.
The implementation is unchanged (the policy is still just an int we pass
around).
Also starts to introduce VmPolicy, for things which are process-wide,
not per-thread. As an initial user, make SQLite's Cursor finalization
leak warnings use StrictMode.
Change-Id: Idedfba4e965716f5089a52036421460b1f383725
2010-10-01 12:54:10 -07:00
Vasu Nori
b745ec9542
am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
...
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp
* commit '173ea0912af296c6e80d14b764046534b316d21f':
DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
2010-09-21 12:25:39 -07:00
Vasu Nori
9540a8d320
DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
...
output now looks like the following
SQL
heap: 551 MEMORY_USED: 551
PAGECACHE_OVERFLOW: 113 MALLOC_SIZE: 50
DATABASES
pgsz dbsz Lookaside(b) Dbname
1 148 500 contacts2.db
1 8 0 (attached) presence_db
1 18 31 :memory:SQL
Change-Id: I8bb65a522fd9478ff2f6a8c27e69f9e6c10aef8a
2010-09-21 12:07:24 -07:00
Jean-Baptiste Queru
c64b916ef5
resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp
...
Change-Id: I8001a95f8c44ef0343e0a50de4bd5b5a85d41c38
2010-08-20 18:19:03 -07:00
Christian Mehlmauer
e7731f0a7f
Added overload methods for DatabaseUtils.queryNumEntries
...
Now you can filter the count statement with a selection
and selection args
UnitTests for this new methods are added to the cts project
Change-Id: Id9233aec0eaac08839041ae7cbaba203470ad3d8
2010-08-20 18:02:09 -07:00
Brad Fitzpatrick
a4ab265134
am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
...
Merge commit '4d5443762bd2b44b28edc2f2f75728911d70eac1' into gingerbread-plus-aosp
* commit '4d5443762bd2b44b28edc2f2f75728911d70eac1':
COMMENT ONLY change to clarify ContentProvider documentation.
2010-07-27 16:54:40 -07:00
Brad Fitzpatrick
4d5443762b
am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
...
Merge commit '86c035f0d176be9cb06b1e4f2390c25701417586' into gingerbread
* commit '86c035f0d176be9cb06b1e4f2390c25701417586':
COMMENT ONLY change to clarify ContentProvider documentation.
2010-07-27 16:52:12 -07:00
Dan Egnor
6fcc0f073d
COMMENT ONLY change to clarify ContentProvider documentation.
...
Gets a little more specific about thread behavior, and makes
pointed comments about not doing too much work in onCreate().
Change-Id: I682f0eb7d7559babee901ed26642751a6ba0a1ea
2010-07-27 16:32:17 -07:00
Brad Fitzpatrick
3e5e21d4dc
am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread
...
Merge commit '1772c34e5331a6456c8a93051192d19ff873c062' into gingerbread-plus-aosp
* commit '1772c34e5331a6456c8a93051192d19ff873c062':
StrictMode: gather and return violating stacks in Binder replies
2010-07-15 15:44:46 -07:00
Brad Fitzpatrick
5b747191ff
StrictMode: gather and return violating stacks in Binder replies
...
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.
Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
2010-07-15 13:18:05 -07:00
The Android Open Source Project
7e343b8d39
merge from froyo-plus-aosp
...
Change-Id: Ic1d0535cb746af0c53a5277b008061f7a2d973a2
2010-06-25 11:20:45 -07:00
Dianne Hackborn
01e4cfc47d
Some ActivityThread/ActivityManager cleanup.
...
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
package scoped.
Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
2010-06-24 15:20:48 -07:00
The Android Open Source Project
e5a023bfbb
merge from open-source master
...
Change-Id: I8e7ccd470e8b90347686985aa2d8337d0c38900c
2010-06-18 12:40:42 -07:00
Brad Fitzpatrick
44dc76a8a7
Log.wtf when databases go to be downgraded.
...
BUG=2734435
Change-Id: I686d6d9415f3081544c3fbe379287c31e0ecec20
2010-06-08 12:20:51 -07:00
Tatsuo Nagamatsu
6d3acde839
fillWindow's start position must be smaller than getCount value
...
Change-Id: I3664ae8f6172f02bf6e2472320e79e3bf8683cc0
2010-06-07 02:07:51 +09:00
Brad Fitzpatrick
cfda9f3a47
Sprinkle new BlockGuard around SQLiteDatabase.
...
SQLite is JNI to native code and doesn't go via IFileSystem, so it
needs custom sprinkling, at least for now.
Change-Id: Ic7fded1b64a4f483dfc17b3a7b136c803df1e111
2010-06-03 12:52:54 -07:00
The Android Open Source Project
1a3b3d4841
merge from open-source master
...
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
2010-05-13 09:04:45 -07:00
Jeff Hamilton
f3ca9a5c7e
Add some documentation about the thread safety of Cursor and some of the SQLite* classes.
...
Change-Id: Icae51052d1c942d7d60bb958d3703411da001079
2010-05-12 16:44:19 -07:00
Vasu Nori
020e534579
bug:2622719 move 'forcing of cursor execution' to ContentProvider
...
revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
and add it to ContentProvider.query() to force query execution
in worker thread, instead of having the main thread incur the cost
of query execution and potentially get ANR
Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
2010-04-28 15:32:54 -07:00
Vasu Nori
0f43f2f700
remove myname accidentally included in one of the files
...
Change-Id: I189db1cc60069b4318fa32a8b5aea6916ac5aa4e
2010-04-27 16:24:20 -07:00
Vasu Nori
0dbb9cee58
accept close() on database objects even if the database is closed
...
bug:2602878
Change-Id: I3075f801ef35d72792ff3daaa1e887e53b58f5f8
2010-04-16 14:24:57 -07:00
Dmitri Plotnikov
5304d8fdc9
Merge "Introducing "strict project map"." into froyo
2010-04-14 18:33:54 -07:00
Dmitri Plotnikov
40eb4aad2b
Introducing "strict project map".
...
Change-Id: I147e10ac6475badf1d21e2c27d1cedbb27bd49df
2010-04-14 16:10:22 -07:00
Vasu Nori
c8e1f23891
verify database state before calling sqlite. Bug:2593970
...
Change-Id: Id68365abccbdca572ad13c2b51162d53993ff540
2010-04-13 15:05:09 -07:00
Tatsuo Nagamatsu
69f789a128
CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
...
Change-Id: I126457c1b709e853727f460095b518b0420aa34f
2010-03-28 14:23:51 +09:00
Dmitri Plotnikov
8f29c12d6e
Forcing query execution in SQLiteDatabase.query
...
The issue is that our code often "executes" a query
on a background thread but iterates over the cursor
on the UI thread. Since we actually do the fetch
on moveToFirst or moveToNext, the query is in reality
often run on the UI thread and causes an ANR.
Change-Id: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
2010-03-24 13:35:03 -07:00
Brad Fitzpatrick
722802e76b
Log database lock contention as well (as seperate pseudo-queries).
...
This also makes the 500ms logging threshold (over which is always
logged, and under which is sub-sampled) configurable via a
SystemProperty, which is mostly useful for interactive debugging when
lock contention is suspected, but could also be useful in the future
as a quick way to adjust this threshold for dogfooders, without code
changes.
Change-Id: I769069d8d870331d89a4aa3239ba50db806fe4d4
2010-03-24 10:45:58 -07:00
Vasu Nori
f3cf8a4da8
when corruption occurs, log a warning before closing db
...
and database.close() should NOT set mPath to null.
a few other minor changes included in this CL
1. if it is memory database, no need to delete any file
2. if 2 threads are sharing the same connection, and if corruption occurs
on it, one thread closes the db and deletes db - while the other
thread is still using it. this can cause SQLITE_MISUSE error.
to prevent this, every method in SQLiteDatabse should make sure
db is open before exec'ing sql statements. bug:2531172
Change-Id: I4cb5ab8539f46d7f8b26c3f830d799adf46444b6
2010-03-23 15:52:02 -07:00
Vasu Nori
7e6ee51359
Merge "print finalizer warning before closing the cursor in finalize"
2010-03-23 13:03:43 -07:00
Vasu Nori
2cc1df0438
print finalizer warning before closing the cursor in finalize
...
this will let us know which cursor is being finalized.
if the heapworker gets wedbed due to the close bug:2536922
then we will never see the warning and never know which cursor
caused this problem
Change-Id: I595cc1014ff7a1114079b33665c092c6a2f3a907
2010-03-23 12:17:25 -07:00
satok
e3b2df827f
Merge "Call super.close() in MargeCursor"
2010-03-22 22:40:10 -07:00
satok
f68258f454
Call super.close() in MargeCursor
...
Bug: 2524465
Change-Id: I1927940b4e3a9417b36ec6169da00475662b6004
2010-03-23 11:15:28 +09:00
Vasu Nori
0a1344efc2
limit sql statement in finalizer warning to 100 chars
...
too long a sql statement reduces the amount of stack trace printed.
Change-Id: Id980b184850adb2bcb5e47eebe35796bc731a490
2010-03-19 10:37:09 -07:00
Vasu Nori
a5bd122122
Merge "close() database should close the db no matter what the ref count says"
2010-03-16 13:33:29 -07:00
Vasu Nori
04708b57da
Merge "fix the way last insert rowid is returned"
2010-03-16 12:29:19 -07:00
Vasu Nori
f6373e9513
close() database should close the db no matter what the ref count says
...
bug:2455416
Change-Id: Ia995c952c6941fbaa016c5b251e4980fa5328fbb
2010-03-16 10:53:40 -07:00
Vasu Nori
5bf67247d2
fix the way last insert rowid is returned
...
if insert statement doesn't succeed, last inserted rowid
shoudl return -1 - instead of returning rowid of the last
successful insert that may have occurred years before this most
recent insert statement failure.
Change-Id: Ia517292afd58fdb600da900e0ee01fe051d6e618
2010-03-16 09:55:13 -07:00
Brad Fitzpatrick
ae6cdd12ac
Allocate SQLiteQueryBuilder's WHERE clause StringBuilder lazily.
...
Number of callers weren't using this, and seemed like a waste to
allocate it when unnecessary.
Change-Id: Iebb701a9eb4f1d9d028bfe74463574f84a36729c
2010-03-14 11:38:06 -07:00
Kenny Root
15a4d2ffd0
Add correct copyright headers to multiple files
...
Format for the list of changes shows the origin commit reference followed
by the file name.
33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b14533328835493e7e22ec9328c0e7986307da1a46b307da1a46beb034652c249237345d8a2b6c3775e3ecd5f43755ebbb4a6b3c4516a7b629bbc21a77321f1bd17b24c62fc0e1e4c62fc0e1ee540833fdf192ab903881619367ab827f8002e59560814f6b1560814f6b1560814f6b11c4907ee771c4907ee771c4907ee7769e21f5f6ec028be4f3b7c6efa13f17c6efa13f17c6efa13f1df8a3f31d8cfaef699e1cfaef699e1cfaef699e1
2010-03-11 18:22:10 -08:00
Vasu Nori
3695709457
debug-flag covered log messages to help people debug finalizer stuff
...
should help developers figure out why finalizer warnings are coming out
of their app.
Change-Id: I50a4ba96c84c6b3cf4445331e1fb55320d8783e1
2010-03-11 14:57:53 -08:00
