Vasu Nori
85f08f9eae
DatabaseCorruptionHandler causes NPE
...
it is trying to get attachedDb list (by executing a pragma) after closing
the database.
also added unittests.
Change-Id: I7dce665ec7354402cdef6fbe055455f5798e123c
2010-05-19 13:55:09 -07:00
Mike Lockwood
387bd8f0c2
Merge "PTP host: Implement getObjectHandles and getObjectInfo commands"
2010-05-19 12:18:16 -07:00
Mike Lockwood
3743365114
PTP host: Implement getObjectHandles and getObjectInfo commands
...
Change-Id: I3ff6e52237f400b4e50c534a1f964c80789bfe98
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-19 15:16:38 -04:00
Scott Main
24c0f44d9e
am f94d2834: am f5172c55: am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
2010-05-19 12:14:05 -07:00
Scott Main
f94d2834e7
am f5172c55: am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
2010-05-19 12:12:09 -07:00
Scott Main
f5172c555f
am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo
...
Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken
* commit '8bf77456cec82cbda3393a4e48f265af1670e795':
docs: revise platform intro
2010-05-19 12:11:03 -07:00
Scott Main
8bf77456ce
am 8d0e37f5: Merge "docs: revise platform intro" into froyo
...
Merge commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp
* commit '8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
docs: revise platform intro
2010-05-19 12:09:04 -07:00
Scott Main
8d0e37f5b1
Merge "docs: revise platform intro" into froyo
2010-05-19 12:05:52 -07:00
Scott Main
0a9cb85a5c
docs: revise platform intro
...
Change-Id: Ie1ff802179b3a2614bee78ca321db8dd064dbc7c
2010-05-19 11:53:33 -07:00
The Android Open Source Project
a2f2a34d51
am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master
2010-05-19 09:45:51 -07:00
The Android Open Source Project
6af002b739
am b32a74c7: am ee1cdd0e: merge from open-source master
2010-05-19 09:44:20 -07:00
The Android Open Source Project
b32a74c73b
am ee1cdd0e: merge from open-source master
...
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken
* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
Don't allow invalid Uris to be added as observers.
2010-05-19 09:43:20 -07:00
The Android Open Source Project
b3f4e15725
am 09603c03: am 37b0da26: am 2b544c9f: merge from open-source master
2010-05-19 09:41:02 -07:00
The Android Open Source Project
09603c0339
am 37b0da26: am 2b544c9f: merge from open-source master
2010-05-19 09:39:29 -07:00
Mike Lockwood
5bae7f615b
More work on PTP host support.
...
Change-Id: Ifbd5bd5efa3cdb750ae1a2aae38181457554d34d
Signed-off-by: Mike Lockwood <mike@spruce.(none)>
2010-05-19 12:38:03 -04:00
The Android Open Source Project
37b0da26fc
am 2b544c9f: merge from open-source master
...
Merge commit '2b544c9f0ea139d052664be0be465c2315707081' into kraken
* commit '2b544c9f0ea139d052664be0be465c2315707081':
Fix isssue 2548710: Native AudioTrack resources never freed.
2010-05-19 09:37:21 -07:00
The Android Open Source Project
ee1cdd0e60
merge from open-source master
...
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
2010-05-19 09:36:55 -07:00
The Android Open Source Project
2b544c9f0e
merge from open-source master
...
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
2010-05-19 09:32:44 -07:00
The Android Open Source Project
ec4eff80cd
am e23c404a: am bea97a89: am 2dc7c6c4: merge from open-source master
2010-05-19 09:26:24 -07:00
The Android Open Source Project
e23c404a70
am bea97a89: am 2dc7c6c4: merge from open-source master
2010-05-19 09:24:37 -07:00
The Android Open Source Project
bea97a897b
am 2dc7c6c4: merge from open-source master
...
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken
* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
Add and document .nomedia constant for MediaStore (Issue 6365)
2010-05-19 09:22:21 -07:00
The Android Open Source Project
2dc7c6c415
merge from open-source master
...
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
2010-05-19 09:20:22 -07:00
Romain Guy
bcb62f099a
Merge "Don't allow invalid Uris to be added as observers."
2010-05-19 09:03:57 -07:00
The Android Open Source Project
75095f693a
am 34b1c116: am b39b0f32: am faf9a783: merge from open-source master
2010-05-19 08:44:59 -07:00
The Android Open Source Project
34b1c11689
am b39b0f32: am faf9a783: merge from open-source master
2010-05-19 08:43:14 -07:00
The Android Open Source Project
b39b0f32d1
am faf9a783: merge from open-source master
...
Merge commit 'faf9a78363b0c773b95c9b43263d788aee313054' into kraken
* commit 'faf9a78363b0c773b95c9b43263d788aee313054':
Text disappears when selecting text in text editor.
2010-05-19 08:41:26 -07:00
The Android Open Source Project
faf9a78363
merge from open-source master
...
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
2010-05-19 08:39:13 -07:00
The Android Open Source Project
39ccc0811f
am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master
2010-05-19 08:36:58 -07:00
Jean-Baptiste Queru
a3e7645514
Merge "Fix isssue 2548710: Native AudioTrack resources never freed."
2010-05-19 08:35:21 -07:00
The Android Open Source Project
56d4bcd85c
am 627356ce: am d6c0bb0f: merge from open-source master
2010-05-19 08:35:16 -07:00
The Android Open Source Project
627356cee4
am d6c0bb0f: merge from open-source master
...
Merge commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa' into kraken
* commit 'd6c0bb0f0f3827f1c336db20ac9dc0eb90cd46fa':
Removed Calls to deprecated APIs
2010-05-19 08:33:27 -07:00
The Android Open Source Project
d6c0bb0f0f
merge from open-source master
...
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
2010-05-19 08:28:32 -07:00
The Android Open Source Project
1dab0e4355
am 6e7cad67: am 0b6defef: am aa2fe148: merge from open-source master
2010-05-19 08:25:30 -07:00
The Android Open Source Project
6e7cad67a9
am 0b6defef: am aa2fe148: merge from open-source master
2010-05-19 08:23:46 -07:00
The Android Open Source Project
0b6defefb9
am aa2fe148: merge from open-source master
...
Merge commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934' into kraken
* commit 'aa2fe148496858e17d0ffd2b8d5d29b89d400934':
Improved error handling when font loading fails.
2010-05-19 08:21:54 -07:00
The Android Open Source Project
aa2fe14849
merge from open-source master
...
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
2010-05-19 08:15:54 -07:00
Anthony Newnam
f51266471c
Don't allow invalid Uris to be added as observers.
...
If a null segment is added, it will cause problems traversing the list
at a later point.
Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
2010-05-19 07:39:07 -05:00
Romain Guy
e02a63f012
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
2010-05-19 00:03:34 -07:00
Romain Guy
7a029da6d6
Merge "Text disappears when selecting text in text editor."
2010-05-19 00:01:55 -07:00
Romain Guy
2b9a49a30d
Merge "Removed Calls to deprecated APIs"
2010-05-19 00:01:02 -07:00
Romain Guy
38581c9d1d
Merge "Improved error handling when font loading fails."
2010-05-18 23:51:16 -07:00
Guang Zhu
b350d3b718
am b990f4f4: (-s ours) am 984680ba: Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
2010-05-18 18:37:42 -07:00
Guang Zhu
0f534e5ddc
am dad33bbd: (-s ours) am 97f8b171: Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken
2010-05-18 18:37:38 -07:00
Guang Zhu
b990f4f434
am 984680ba: Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
2010-05-18 18:35:35 -07:00
Guang Zhu
dad33bbd9e
am 97f8b171: Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken
2010-05-18 18:35:31 -07:00
Guang Zhu
984680baff
Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken
2010-05-18 18:33:35 -07:00
Guang Zhu
97f8b171f1
Merge "add execution permission to "input" script (DO NOT MERGE)" into kraken
2010-05-18 18:33:30 -07:00
Dianne Hackborn
b269735ca0
am 4a30bcf7: am 74323fd1: Update NativeActivity to allow direct surface access.
2010-05-18 18:28:57 -07:00
Suchi Amalapurapu
d7289efbad
am 2be883c4: am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
2010-05-18 18:27:56 -07:00
Jaikumar Ganesh
2e096c232c
am 13da084d: am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo
2010-05-18 18:27:50 -07:00
