8180 Commits

Author SHA1 Message Date
Vasu Nori
4dd4ab4cc3 add instrumentation to log the sql statement + bindargs + databasename
capture the sql statement along with the bindargs passed in. this will help
one to see the sql statements being executed and hopefully will help
debug incorrect-sql bugs.
2010-02-01 23:05:33 -08:00
Vasu Nori
6eb7c45a8f make SqliteDatabase ConflictAlgorithm and associated methods public.
SQLiteDatabase.java has ConflictAlgorithm which allows callers to specify
actions to take when insert or update causes constraint violations.
These actions are documented at http://www.sqlite.org/lang_conflict.html.

why make these public? usecase is the following:
Gmail has a table with a column "_id" being the integer primary key and
they let sqlite assign key values to the column.
but there is another UNIQUE key column (message_id) in the table.
so an insert could fail due to constraint violation on the message_id column
(i.e., not on the primary key). and when that happens, they would like to
get the value of _id that caused constraint violation.

currently hidden method insertOnConflict() already provides the above
functionality. that means exposing ConflictAlgorithm also.
2010-01-29 12:24:28 -08:00
Bjorn Bringert
60f1b95ef3 Merge "Update search source selector assets" 2010-01-29 09:23:05 -08:00
Bjorn Bringert
aa0cfa7b6b Update search source selector assets
Change-Id: Id56e2ac195e1d1f8dcfe2fbe07025f3527396bba
2010-01-29 16:15:36 +00:00
San Mehat
b4a162e50a framework: os: Introduce IMountServiceObserver
Signed-off-by: San Mehat <san@google.com>
2010-01-29 06:30:03 -08:00
Daniel Sandler
77c292d83e Merge "New full-screen activity for USB mass storage interaction." 2010-01-29 06:22:33 -08:00
Adam Powell
a9938c4bf4 Merge "Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView." 2010-01-28 21:24:10 -08:00
Adam Powell
f54460576e Don't bounce programmatic scrolls of ScrollView and HorizontalScrollView. 2010-01-28 17:25:29 -08:00
Tom Taylor
5e342fa326 Remove MMS from the framework
The MMS code has been moved into the mms-common library.
Move SqliteWrapper (and make it hidden) into the database
directory because Telephony.java depends on it. Create a mmscommon
library similar to androidcommon for a number of files used both
by the telephony layer, by mms, and by myfaves.

Change-Id: I2e23e87c4961b87c42a4c8a63f812fa9e0e44dec
2010-01-28 16:59:27 -08:00
Jean-Baptiste Queru
d09f4aaba2 resolved conflicts for merge of bb074ef9 to master
Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
2010-01-28 15:21:25 -08:00
Jim Miller
2e9dea1dbe am fbf977be: am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit 'fbf977be5471a81b664bfc0a048497f268688a17'

* commit 'fbf977be5471a81b664bfc0a048497f268688a17':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
2010-01-28 14:57:03 -08:00
Adam Powell
4d3cef348b Merge "ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller." 2010-01-28 14:03:15 -08:00
Adam Powell
3fc3737ceb ScrollView and HorizontalScrollView now will spring back if smoothScrollBy scrolls out of bounds. Tweaked bounce physics for OverScroller. 2010-01-28 13:52:24 -08:00
Jean-Baptiste Queru
1ad05dcbf5 Merge "resolved conflicts for merge of 33ca1f32 to master" 2010-01-28 13:19:56 -08:00
Daniel Sandler
b94f795c25 New full-screen activity for USB mass storage interaction.
Still TODO: patch into forthcoming callbacks from
MountService so the USB storage activity always shows the
correct state of the device. (Right now it only refreshes
its display onResume.)

Bug: 2299129
2010-01-28 16:18:22 -05:00
Kenny Root
e096ddee54 resolved conflicts for merge of 33ca1f32 to master
Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f
2010-01-28 13:16:19 -08:00
Dianne Hackborn
254cb446fa More device admin.
- Clean up device policy manager APIs.
- Implement lockNow().  For now this just turns the screen off to lock the device.
2010-01-28 13:15:57 -08:00
Andreas Huber
2fd75f3515 Merge "API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played." 2010-01-28 12:56:17 -08:00
Andreas Huber
2564300936 API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
2010-01-28 11:52:43 -08:00
Brian Carlstrom
6505122dfe Issue 1597: browser crash possibly related to invalid SSL certificate 2010-01-28 11:17:43 -08:00
Grace Kloba
6790918497 Use a single EXTRA_HEADERS intent. 2010-01-28 09:19:10 -08:00
Grace Kloba
0561f1175d Merge "Need to check parent for performLongClick() as it is the result of a delayed message." 2010-01-28 09:14:52 -08:00
Patrick Scott
75d76bcf52 Merge "First pass at the url rendering service." 2010-01-28 08:32:43 -08:00
Andy McFadden
1812a4bfda Merge "Add streaming method profiling support." 2010-01-28 07:27:32 -08:00
Patrick Scott
45948fd407 First pass at the url rendering service.
The service renders a list of urls at the given dimension and invokes the
callback interface for each result. A ParcelFileDescriptor is used to transfer
the large image data to the client. The client must close the file descriptor
is order free the underlying resources.

A more robust api will use UrlRendererRequest and UrlRendererResponse objects
to transfer data.
2010-01-28 08:27:42 -05:00
Romain Guy
7543f9e293 Merge "Added OverScroller and overscroll effects for ScrollView and HorizontalScrollView." 2010-01-27 22:00:44 -08:00
Adam Powell
17dfce15d5 Added OverScroller and overscroll effects for ScrollView and HorizontalScrollView. 2010-01-27 21:15:58 -08:00
Fred Quintana
a322dfa47e am 6f3e1e27: am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair
Merge commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5'

* commit '6f3e1e27a697d3e64bf73792c1007135319ff0d5':
  initialize sync adapters that get installed while the system is running
2010-01-27 18:40:11 -08:00
Dianne Hackborn
d47c6ed4a9 Bite the bullet and add support for multiple device admins. 2010-01-27 17:31:56 -08:00
Eric Fischer
93a81378d8 am ad0e5363: am 50adb167: Pull in "emergency calls only" translations.
Merge commit 'ad0e53635571066e7928e30a4a669067fff6a382'

* commit 'ad0e53635571066e7928e30a4a669067fff6a382':
  Pull in "emergency calls only" translations.
2010-01-27 17:27:23 -08:00
John Wang
a338136499 am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '97fdd0aba93f7c609c1194edf636805ff70e4918'

* commit '97fdd0aba93f7c609c1194edf636805ff70e4918':
  Add Emergency Calls Only String.
2010-01-27 17:26:40 -08:00
Chih-Chung Chang
e7bd22a9d9 Unhide camera api for set display orientation. 2010-01-27 17:05:21 -08:00
Wei Huang
83e5ff09d5 am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3'

* commit '29bc7270ec2fd54707326eeee556be2fd4d86ca3':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
2010-01-27 16:29:10 -08:00
Romain Guy
87ef4252ec resolved conflicts for merge of 176a88ff to master 2010-01-27 16:20:49 -08:00
Romain Guy
43c9cdffb6 New View.dispatchDisplayHint() API.
Bug #2399147

This new API will be used by scrollable containers to tell children that they
are/are not displayed. This will allow lists to hide their filter popup window
for instance.
2010-01-27 15:53:40 -08:00
Owen Lin
507354e4ba Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functions in preference manager." 2010-01-27 15:48:26 -08:00
Grace Kloba
98e6fcf2f7 Need to check parent for performLongClick() as it
is the result of a delayed message.

Fix http://b/issue?id=2398251
2010-01-27 15:20:30 -08:00
Andy McFadden
72a20db0c7 Add streaming method profiling support.
This adds a new (hidden) startMethodTracingDdms call.  It's like the
normal method tracing calls, but you don't specify an output file.
Instead, when tracing stops, the data is sent directly to DDMS.

This also adds handlers for the MPSS/MPSE requests that DDMS sends.
2010-01-27 14:48:41 -08:00
Neal Nguyen
1d3165f10b Phase 2 of test file cleanup: relocating test files from FrameworkTest closer to their sources in core.
In addition to the file moves, the package names of the tests have been updated and adjusted to match their new locations.
2010-01-27 14:15:55 -08:00
Neal Nguyen
e6dca5c29b Merge "Moving framework core tests closer to their source files." 2010-01-27 14:03:34 -08:00
Dianne Hackborn
8ea138cbf1 More work on device admins:
- You can now show a dynamic message to the user when asking to
  have your DeviceAdmin added.
- A DeviceAdmin can now provide a warning message that is displayed
  before a user disables it.
- Better ordering (and text) of the policy warnings.
- New API to set the maximum failed password attempts before the device
  wipes itself.
- We now store the number of failed unlock attempts in persistent
  storage.
- New managed dialog APIs that will be used by the settings app.

Also a little bit of cleanup as I was working on this - removed the
long unused MailboxNotAvailableException, fixed a java doc in Messenger.
2010-01-27 13:51:53 -08:00
Grace Kloba
2fc1f4a029 Merge "Add request header support for the Browser/WebView. QSB can use this instead of POST to send the location data. After QSB makes the switch, we should also remove the POST_DATA intent which is hidden." 2010-01-27 13:41:39 -08:00
Neal Nguyen
22e31e5b60 Moving framework core tests closer to their source files.
Phase 2 of test case cleanup; distributing CoreTests files closer to their respective sources under frameworks.
2010-01-27 13:36:38 -08:00
Ken Shirriff
6c1ddedfee Merge "Fix ExtendedProperties EntityIterator." 2010-01-27 13:08:01 -08:00
Amith Yamasani
a3b95a995f Merge "Move Search dialog out of system process into current activity." 2010-01-27 12:45:23 -08:00
Grace Kloba
bb074ef9c2 am 769ed21c: Fix http://b/issue?id=2400423.
Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp

* commit '769ed21c33c3629411eb3bbf924de45737a18067':
  Fix http://b/issue?id=2400423.
2010-01-27 12:30:19 -08:00
Ken Shirriff
3b16892c6b Fix ExtendedProperties EntityIterator.
The iterator was using the wrong cursor.

bug 2399618
2010-01-27 12:28:33 -08:00
Grace Kloba
d0d9bc2f2f Add request header support for the Browser/WebView.
QSB can use this instead of POST to send the location
data. After QSB makes the switch, we should also
remove the POST_DATA intent which is hidden.

Add loadUrl(String url, HashMap extraHeaders) to
WebView so that the caller can send the extra http
headers.

Remove "inline:" as no one is using it and it is a
hidden feature.

Part 1 of 3-project checkin.
2010-01-27 12:28:11 -08:00
Grace Kloba
769ed21c33 Fix http://b/issue?id=2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
2010-01-27 12:24:38 -08:00
Amith Yamasani
e9ce3f01d4 Move Search dialog out of system process into current activity.
SearchManager now manages the SearchDialog, in-process.
Nuked SearchDialogWrapper
SearchManagerService now just holds the Searchables information.
Hitting Search when in the local Search dialog will launch the QSB.
2010-01-27 12:16:45 -08:00