Jason Sams
b328269531
Merge "Fix native crash when GL driver fails to initialize."
2011-07-13 16:43:27 -07:00
Dave Santoro
b6e5e7a740
Merge "Contacts contract update for display photos."
2011-07-13 16:23:44 -07:00
Jason Sams
fb06b7a551
Fix native crash when GL driver fails to initialize.
...
Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
2011-07-13 16:09:42 -07:00
Kenny Root
a1b68687de
Merge "Add StorageVolume list to MountService dump"
2011-07-13 15:53:12 -07:00
Kenny Root
f953dee175
Merge "Fix debugging for hwui caches"
2011-07-13 15:53:03 -07:00
Daniel Lehmann
6a8f7795c9
Merge "Allow a sync adapter to provide an OPEN action for a group"
2011-07-13 15:40:03 -07:00
Christopher Tate
9a79cda53b
Merge "Compress the backup output stream"
2011-07-13 15:37:21 -07:00
Daniel Lehmann
e6d3d28a6b
Allow a sync adapter to provide an OPEN action for a group
...
Bug:4413120
Change-Id: I17572204dc9fad3406d2505c83586b9dbce177b9
2011-07-13 15:35:05 -07:00
Christopher Tate
7926a693c4
Compress the backup output stream
...
Zlib compression, with a full flush between each application's
data. Encryption will be performed on the already-compressed data
once that's implemented.
On restore, the streamed data is similarly uncompressed on the fly.
Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
2011-07-13 15:30:41 -07:00
Jeff Sharkey
19d2c0b0c0
Merge "Control socket tagging through Settings.Secure."
2011-07-13 15:28:06 -07:00
Jeff Sharkey
62a2c8fed9
Control socket tagging through Settings.Secure.
...
When NetworkManagementService starts, it determines if qtaguid
should be enabled. The changes pushes the enabled state to a system
property to control socket tagging.
Change-Id: I5697a990dbaad4b220a2fb055931b18077d07a74
2011-07-13 15:25:11 -07:00
Andreas Huber
2d912dd5ea
Merge "Remove old-style software decoders."
2011-07-13 15:19:44 -07:00
David 'Digit' Turner
bd55ab1877
am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
...
* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
2011-07-13 14:55:20 -07:00
Scott Main
605a80f3c3
am 9b446cd6: am bc047bb0: am e32c49ab: docs: de-new sidenavs
...
* commit '9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
docs: de-new sidenavs
2011-07-13 14:55:15 -07:00
Robert Ly
0e9bc56e75
am 4e400158: am 1e4cf2dd: am 10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
...
* commit '4e4001589911b971d56c72acee140526d4575dac':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
2011-07-13 14:54:44 -07:00
Scott Main
1c91fac1ab
am 22f4e8f6: am 56a085c9: am d3fa7bd1: docs: fix date on opengl dashboard
...
* commit '22f4e8f627e3f54b418da422eadcf0c43caa3499':
docs: fix date on opengl dashboard
2011-07-13 14:54:24 -07:00
Xavier Ducrohet
37b3cc3bbe
am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
...
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
Merge 36a3a392 from mr1.
2011-07-13 14:53:54 -07:00
Dave Santoro
a528237b80
Contacts contract update for display photos.
...
This adds support for storing larger, hi-res photos in the contacts
system. Thumbnails continue to be stored in the Photo.PHOTO column
as BLOBs, while hi-res versions of the photos are stored in the file
system and referenced via a photo file ID (with metadata stored in
a new table).
See go/large-photo-design for details.
Change-Id: Ie182eaa6a0330e2eca0a732f201f20a91e4dc584
2011-07-13 14:50:22 -07:00
Mike Lockwood
fd909a774c
Merge "MediaScanner: fix breakage in updates"
2011-07-13 14:33:13 -07:00
Robert Ly
afcec44d5f
Merge "docs: fix for bug 3186839"
2011-07-13 14:28:52 -07:00
Robert Ly
a704daa8b1
docs: fix for bug 3186839
...
Change-Id: I28305b73f0fe02593e072d690471a1448eb4c675
2011-07-13 14:25:52 -07:00
Svetoslav Ganov
3b56b0d74b
Merge "Polish of the ActivityChooserView and ShareActionProvider."
2011-07-13 14:19:33 -07:00
Andreas Huber
a8ccc50175
Remove old-style software decoders.
...
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
2011-07-13 14:14:08 -07:00
repo sync
0d4fc33479
Merge "Add REFER handling."
2011-07-13 14:09:33 -07:00
Chris Craik
101eb4810c
Merge "Tile profiling interface"
2011-07-13 14:08:11 -07:00
Mathias Agopian
40001da8fa
Merge "get rid of overlay HAL"
2011-07-13 14:07:01 -07:00
Svetoslav Ganov
76559a65ad
Polish of the ActivityChooserView and ShareActionProvider.
...
1. Addressed the UX comments: ActivityChooserView's default selection
popup no longer shows a message, rather hightlights the default
action which now it displays. Alignemnt of the UI.
2. The ShareActionProvider shows a sub-menu if the host item goes
on the overflow menu.
3. Now the heade layout of the activity chooser view is not needed hence
dropped and the item and footer ones are merged.
Change-Id: I0b3de623e4c0a805be9ed73a8541e66b8c00e2d2
2011-07-13 13:57:32 -07:00
Mike Lockwood
45aaa2a345
MediaScanner: fix breakage in updates
...
To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records
Bug: 5021925
Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 16:50:29 -04:00
Chris Craik
445ab74a21
Tile profiling interface
...
Allows access to underlying WebView benchmarking calls.
Uses C++ backend from the following CL:
https://android-git.corp.google.com/g/#change,121035
Change-Id: Ib205340451aadfd40425f492afa4f2e46d314ebc
2011-07-13 13:19:37 -07:00
Jeff Brown
023e8c72e9
Merge "Revert "fix a weird use of Vector::appendVector()""
2011-07-13 13:00:38 -07:00
Jeff Brown
b99a82437c
Revert "fix a weird use of Vector::appendVector()"
...
This reverts commit 198fd888add624cf9e53ce31b776568a5d069916
This change seems to have exposed some other bugs.
Bug: 5026631
2011-07-13 12:51:11 -07:00
Jason Sams
3ac60ada27
Merge "Add slot number to forEach hal."
2011-07-13 12:28:38 -07:00
Jason Sams
92b0eab07e
Add slot number to forEach hal.
...
Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c
2011-07-13 11:26:26 -07:00
Kenny Root
042f7d64b5
Fix debugging for hwui caches
...
Debugging code attempted to delete a stack item.
Also, the flag fields weren't exactly clear, so rewrite it so it's
clear that kDebugMoreCaches is a combined flag.
Change-Id: If42b7f0f754919343301da5656aee5943cc9bd4a
2011-07-13 09:51:00 -07:00
Kenny Root
4161f9b303
Add StorageVolume list to MountService dump
...
Change-Id: If2be6e420d9671032d2e7a66c71a6733e6e48ac8
2011-07-13 09:48:33 -07:00
Andreas Huber
67d464f47e
Enable signalling of a stream discontinuity involving a format-change
...
through IStreamListener.
Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug: 5022434
2011-07-13 09:47:09 -07:00
Mike Lockwood
9cba686366
Merge "MTP: Clean up MtpServer initialization and threading:"
2011-07-13 08:07:59 -07:00
Mike Lockwood
de033beae4
Merge "UsbDeviceManager: clean up HandlerThread creation"
2011-07-13 07:34:29 -07:00
Narayan Kamath
948d9fef89
Merge "Wait until the audio track finishes playing before releasing it."
2011-07-13 07:30:27 -07:00
Mike Lockwood
dcc31946f2
MTP: Clean up MtpServer initialization and threading:
...
Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)
Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
2011-07-13 09:44:42 -04:00
Mike Lockwood
3fd13eb632
UsbDeviceManager: clean up HandlerThread creation
...
Change-Id: I84683b1753fcf3c3b501f8a506d6d890edf2eb37
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 09:39:54 -04:00
Narayan Kamath
47d6288541
Wait until the audio track finishes playing before releasing it.
...
Release calls stop, which causes truncation of playback.
bug:5021056
Change-Id: I8eadcbf5622dab83be3c4dabfcc06629398f27ab
2011-07-13 13:59:45 +01:00
Jeff Sharkey
3862096cbf
Merge "Include full network history around current time."
2011-07-12 20:23:03 -07:00
Jeff Sharkey
434962e44e
Include full network history around current time.
...
When requesting historical values with time ranges, always include
full values for buckets that span current time. (It doesn't make
sense to interpolate partial data.) Move getTotalData() to return
full Entry objects to prepare for packet counts.
Bug: 4691901
Change-Id: I717bd721be9f1d4a47c4121e46e07a56cb15bbf1
2011-07-12 20:20:56 -07:00
Romain Guy
6ce9ed955e
Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant.""
2011-07-12 19:10:22 -07:00
Romain Guy
08645eb0f4
Revert "Don't preload HardwareRenderer, its static initialization is process dependant."
...
This reverts commit 821e24336b3ab1f902fc3ee8da423226f50b540c.
2011-07-12 19:09:03 -07:00
Fabrice Di Meglio
a6c53c7939
Merge "Introduce TextView drawableStart and drawableEnd"
2011-07-12 18:24:27 -07:00
Romain Guy
c93ffea268
Merge "Don't preload HardwareRenderer, its static initialization is process dependant."
2011-07-12 18:18:11 -07:00
Romain Guy
821e24336b
Don't preload HardwareRenderer, its static initialization is process dependant.
...
Change-Id: I229357aaaa10b19209983c122f98dd3c07e01d7f
2011-07-12 18:16:35 -07:00
Iliyan Malchev
d420b18c43
Merge "Add support for TI H264 encoder"
2011-07-12 17:40:25 -07:00