Commit Graph

8192 Commits

Author SHA1 Message Date
Mathias Agopian
239d5b3638 Merge "Simplify the MemoryDealer implementation" 2010-01-29 15:07:05 -08:00
Chris Tate
4a20061f34 Merge "Make backup/restore asynchronous and enforce timeouts" 2010-01-29 15:02:03 -08:00
Mathias Agopian
6faf7893b6 Simplify the MemoryDealer implementation
At some point the implementation became complicated because of
SurfaceFlinger's special needs, since we are now relying on gralloc
we can go back to much simpler MemoryDealer.

Removed HeapInterface and AllocatorInterface, since those don't need
to be paramterized anymore. Merged SimpleMemory and Allocation.
Made SimplisticAllocator non virtual.

Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED)

Removed a lot of unneeded code.
2010-01-29 14:51:06 -08:00
Ray Chen
bf124e7e41 Unhide ThumbnailUtils to support Camera unbundling.
http://b/2375978
2010-01-29 14:30:05 -08:00
Jack Palevich
c88ed5dc5d Merge "Implement the GL11ExtensionPack APIs." 2010-01-29 14:28:36 -08:00
Mike Lockwood
98af636abb Merge "Support for triggering the lockscreen while the screen is on:" 2010-01-29 14:21:38 -08:00
Chris Tate
391e62690e Merge "Add a method to IBackupTransport to get the current backup set token" 2010-01-29 14:15:14 -08:00
Christopher Tate
44a2790374 Make backup/restore asynchronous and enforce timeouts
Callouts to app backup agents are now asynchronous, and timeouts are applied if
they take too long, hang, etc.  The initial timeouts are set to 15 seconds on
backup, 60 seconds on restore.  These operations typically run at background
priority, so it's necessary to give them ample time to run.

As part of setting up this asynchronicity, the Backup Manager's internal thread
management has been overhauled.  It now spins off a single HandlerThread at
startup, and runs backup/restore/etc operations *synchronously* in that thread,
applying timeouts as appropriate.  This means we're no longer spinning up new
threads all the time, and furthermore it ensures that we can never have more
than one operation in flight at once.  Later CLs will remove the now-redundant
logic that previously ensured that operations didn't stomp on each other.

Bug: 2053560
Change-Id: Ie4315c219c7ff6dd8f51f2ad6c0872595b18cff1
2010-01-29 14:07:52 -08:00
Christopher Tate
50c6df04cf Add a method to IBackupTransport to get the current backup set token
This will be used to specifically manage restores of last-known-good data
generated from the current device during its normal provisioned lifetime.
2010-01-29 14:06:15 -08:00
Mike Lockwood
ef73162887 Support for triggering the lockscreen while the screen is on:
Add new ALLOW_LOCK_WHILE_SCREEN_ON window manager flag, which when set
causes the window manager to put up the lockscreen after the
normal screen timeout has elapsed.

Add plumbing to pass PowerManager.userActivity() to the window manager policy.

Change-Id: I05adc52bad39c56031a08e8ec3cbcf5c2d9b9827
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-29 17:05:04 -05:00
Oscar Montemayor
7bfa1f3a72 Merge "Apps on SD card project. This class implements heuristics to determine best app install location, without looking at the package flags (pre-parsing stage)." 2010-01-29 13:28:46 -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
Oscar Montemayor
1228d0a1dd Apps on SD card project.
This class implements heuristics to determine best app install location, without looking at the package flags (pre-parsing stage).
2010-01-28 21:03:16 -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
Jack Palevich
8a4de4be9e Implement the GL11ExtensionPack APIs. 2010-01-28 20:28:32 +08: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