OSDN Git Service
Romain Guy [Thu, 14 Jul 2011 19:42:19 +0000 (12:42 -0700)]
Force bitmaps to load in ARGB8888 by default.
Bug #
5024993
Change-Id: Id0c63f675ae188e5a786b7fdd63916e114b9ed4a
Philip Milne [Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)]
Merge "Rationalize API after adding maximum size feature."
Narayan Kamath [Thu, 14 Jul 2011 18:13:07 +0000 (11:13 -0700)]
Merge "Minor documentation updates for the AudioTrack class."
Glenn Kasten [Thu, 14 Jul 2011 17:59:40 +0000 (10:59 -0700)]
Merge "Add MEDIA_UID"
Wink Saville [Thu, 14 Jul 2011 17:55:58 +0000 (10:55 -0700)]
am
3810361e: am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
Remove STOPSHIP but allow seamless Handoff when possible.
Jaikumar Ganesh [Thu, 14 Jul 2011 17:55:55 +0000 (10:55 -0700)]
am
6dd45316: (-s ours) resolved conflicts for merge of
ab3ec176 to honeycomb-plus-aosp
* commit '
6dd4531639157191e6224d3f8af5c9d099ca945f':
Bluetooth: correcting return value from cancelDiscovery
John Wang [Thu, 14 Jul 2011 17:49:38 +0000 (10:49 -0700)]
am
28d92afc: am
2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '
28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
Add getImei() to Phone interface.
Dianne Hackborn [Thu, 14 Jul 2011 17:48:01 +0000 (10:48 -0700)]
Merge "Improve handling of low memory."
Adam Powell [Thu, 14 Jul 2011 03:40:52 +0000 (20:40 -0700)]
Nicer API for disabling/enabling the home/up button in action bars.
Have an explicit call for enabling the home/up button. Auto-enable it
if the app targets < ICS to preserve Honeycomb behavior. Auto-enable
it if the app shows home as up.
This prevents unwanted touch/focus feedback on the home button when
the app hasn't wired it up to do anything useful.
Change-Id: Icfe95ab5a11b3998bca08b0fbbfe1bf6c3c89b5d
Dianne Hackborn [Thu, 14 Jul 2011 02:33:41 +0000 (19:33 -0700)]
Improve handling of low memory.
Now classify background processes into a set of bins of how much
memory they should try to clear. The last bin also involves
destroying all activities in that process.
Removed the old code for the simulator that is no longer needed
(yay). The debugging features it had are now integrated into the
regular oom adj code.
Small fixes to load average service.
Change-Id: Ic8df401714b188c73b50dbc8f8e6345b58f1f3a0
Narayan Kamath [Thu, 14 Jul 2011 15:37:46 +0000 (16:37 +0100)]
Minor documentation updates for the AudioTrack class.
Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
Jaikumar Ganesh [Thu, 14 Jul 2011 17:08:41 +0000 (10:08 -0700)]
Merge "Remove Car audio class from auto pairing."
James Dong [Thu, 14 Jul 2011 16:59:24 +0000 (09:59 -0700)]
Merge "Support profile and level query for SW video decoders"
Jeff Hamilton [Thu, 14 Jul 2011 16:53:08 +0000 (09:53 -0700)]
Merge "unhide public apis"
Jaikumar Ganesh [Thu, 14 Jul 2011 02:05:23 +0000 (19:05 -0700)]
Remove Car audio class from auto pairing.
Majority of the cars don't auto pair unlike headsets, as they have a display.
Instead of maintaining a blacklist of such cars, disable
auto pairing with 0000. This is legacy anyway as newer cars
come with 2.1 pairing.
Change-Id: I644e2da4d11cf2d250d846853523d7975ca000fc
Andreas Huber [Thu, 14 Jul 2011 16:09:14 +0000 (09:09 -0700)]
Merge "Include all supported mime types when querying decoder profile/level support."
Andreas Huber [Thu, 14 Jul 2011 16:09:07 +0000 (09:09 -0700)]
Merge "Remove legacy http support from stagefright, chromium is the new hotness."
Narayan Kamath [Thu, 14 Jul 2011 15:44:39 +0000 (08:44 -0700)]
Merge "Minor cleanups to TextToSpeech."
Glenn Kasten [Thu, 14 Jul 2011 14:54:34 +0000 (07:54 -0700)]
Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
Narayan Kamath [Thu, 14 Jul 2011 14:30:36 +0000 (15:30 +0100)]
Minor cleanups to TextToSpeech.
(a) Fix an NPE reported when no TTS engine is installed.
(b) Fix a bad link, and some javadoc typos.
bug:
5004015
Change-Id: I38b97dbb5d7d4065a5ee408fae9138638ed48f40
Jeff Brown [Thu, 14 Jul 2011 11:20:56 +0000 (04:20 -0700)]
Merge "Refactor input dispatcher use of window/app handles."
Jeff Brown [Thu, 14 Jul 2011 11:12:51 +0000 (04:12 -0700)]
Merge "Fix invalid JNI call signature. Bug:
5029536"
Jeff Brown [Thu, 14 Jul 2011 05:51:29 +0000 (22:51 -0700)]
Refactor input dispatcher use of window/app handles.
This change moves the cached window and application input state
into the handle objects themselves. It simplifies the dispatcher
somewhat because it no longer needs to fix up references to
transient InputWindow objects each time the window list is updated.
This change will also make it easier to optimize setInputWindows
to avoid doing a lot of redundant data copying. In principle, only
the modified fields need to be updated. However, for now we
continue to update all fields in unison as before.
It turns out that the input dispatcher was inappropriately retaining
pointers to InputWindow objects within the mWindows InputWindow
vector. This vector is copy-on-write so it is possible and the
item pointers to change if an editing operation is performed on
the vector when it does not exclusively own the underlying
SharedBuffer. This bug was uncovered by a previous change that
replaced calls to clear() and appendVector() with a simple use
of operator= which caused the buffer to be shared. Consequently
after editItemAt was called (which it shouldn't have, actually)
the buffer was copied and the cached InputWindow pointers became
invalid. Oops. This change fixes the problem.
Change-Id: I0a259339a6015fcf9113dc4081a6875e047fd425
Jeff Brown [Thu, 14 Jul 2011 10:54:36 +0000 (03:54 -0700)]
Fix invalid JNI call signature.
Bug:
5029536
Change-Id: I1f9b3faa77d49e26ef43982ff57cbbf0c3be8b40
Mathew Inwood [Fri, 8 Jul 2011 16:26:46 +0000 (17:26 +0100)]
SearchBox API changes, to know when calls succeeded.
Depends on change: I5af94c8df8f24dfafb02c4052381aa547c72684c
(due to SearchBox API change).
Change-Id: If283ecdfa62aecb1fa697b1a2cd43b771b908d72
Jeff Brown [Thu, 14 Jul 2011 05:18:46 +0000 (22:18 -0700)]
Provide more descriptive name for InputChannel ashmem.
Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
Philip Milne [Tue, 12 Jul 2011 21:49:45 +0000 (14:49 -0700)]
Rationalize API after adding maximum size feature.
. Change name of Group to Spec
(with the addition of the fglexibility field, this class no longer represents a group)
. Replace overloaded Group/Spec constructors with factory method
. Bugfix for measure() when alignmentMode == ALIGN_BOUNDS
. Bury as much Java API as possible, to minimize restrictions on future API enhancements
- make all field access in Group package private
- use factory methods in place of field assignment
Change-Id: I46a5027a013bf7c3110b77108b8fd0427165cd18
Adam Powell [Thu, 14 Jul 2011 03:42:19 +0000 (20:42 -0700)]
Fix bug in submenus opened from icon menus
Change-Id: I8b60ceefbccb5cad78d1b5c55702a2685a5f5382
Adam Powell [Thu, 14 Jul 2011 03:07:41 +0000 (20:07 -0700)]
Merge "Preserve spacing for icons in menus"
Adam Powell [Wed, 13 Jul 2011 17:24:06 +0000 (10:24 -0700)]
Preserve spacing for icons in menus
Change-Id: I3269fcffb98a84b6a5c5f9198afd2b2eae7d5f02
Glenn Kasten [Wed, 13 Jul 2011 23:23:22 +0000 (16:23 -0700)]
Add MEDIA_UID
Change-Id: Iaf03913dce95420e21c79226031b7caaaedf2ce8
Ben Dodson [Thu, 14 Jul 2011 00:38:33 +0000 (17:38 -0700)]
unhide public apis
Change-Id: I3bbe0e7c1e135a4654f63c34c024d7aa10341279
Svetoslav Ganov [Thu, 14 Jul 2011 00:23:41 +0000 (17:23 -0700)]
Merge "Touch exploration gesture events change the window id."
Svetoslav Ganov [Thu, 14 Jul 2011 00:16:34 +0000 (17:16 -0700)]
Touch exploration gesture events change the window id.
1. Touch exploration start and end events are generated
by the sytstem to provide additional information for
accessibility services. Since such events do not come
from any particular window they whould not change the
id of the window that currently allows exploring its
content.
2. Touch exploration start and end events were lealing the
touch explorer class wich is private.
bug:
5026258
Change-Id: Icaf3e2bd9566716f2afb876cf8e0d50813b0c76e
Mike Lockwood [Wed, 13 Jul 2011 23:46:50 +0000 (16:46 -0700)]
Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build"
Mike Lockwood [Wed, 13 Jul 2011 15:06:57 +0000 (11:06 -0400)]
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jason Sams [Wed, 13 Jul 2011 23:43:27 +0000 (16:43 -0700)]
Merge "Fix native crash when GL driver fails to initialize."
Dave Santoro [Wed, 13 Jul 2011 23:23:44 +0000 (16:23 -0700)]
Merge "Contacts contract update for display photos."
Jason Sams [Wed, 13 Jul 2011 23:09:42 +0000 (16:09 -0700)]
Fix native crash when GL driver fails to initialize.
Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
Kenny Root [Wed, 13 Jul 2011 22:53:12 +0000 (15:53 -0700)]
Merge "Add StorageVolume list to MountService dump"
Kenny Root [Wed, 13 Jul 2011 22:53:03 +0000 (15:53 -0700)]
Merge "Fix debugging for hwui caches"
Andreas Huber [Wed, 13 Jul 2011 22:45:01 +0000 (15:45 -0700)]
Remove legacy http support from stagefright, chromium is the new hotness.
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
Daniel Lehmann [Wed, 13 Jul 2011 22:40:03 +0000 (15:40 -0700)]
Merge "Allow a sync adapter to provide an OPEN action for a group"
Christopher Tate [Wed, 13 Jul 2011 22:37:21 +0000 (15:37 -0700)]
Merge "Compress the backup output stream"
Daniel Lehmann [Wed, 13 Jul 2011 22:35:05 +0000 (15:35 -0700)]
Allow a sync adapter to provide an OPEN action for a group
Bug:
4413120
Change-Id: I17572204dc9fad3406d2505c83586b9dbce177b9
Christopher Tate [Mon, 11 Jul 2011 18:31:57 +0000 (11:31 -0700)]
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
Jeff Sharkey [Wed, 13 Jul 2011 22:28:06 +0000 (15:28 -0700)]
Merge "Control socket tagging through Settings.Secure."
Andreas Huber [Wed, 13 Jul 2011 22:27:04 +0000 (15:27 -0700)]
Include all supported mime types when querying decoder profile/level support.
Change-Id: Ia1c930eee489bfebb482ac5079bd6ac9354532f2
Jeff Sharkey [Wed, 13 Jul 2011 22:24:02 +0000 (15:24 -0700)]
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
Andreas Huber [Wed, 13 Jul 2011 22:19:44 +0000 (15:19 -0700)]
Merge "Remove old-style software decoders."
David 'Digit' Turner [Wed, 13 Jul 2011 21:55:20 +0000 (14:55 -0700)]
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
Scott Main [Wed, 13 Jul 2011 21:55:15 +0000 (14:55 -0700)]
am
9b446cd6: am
bc047bb0: am
e32c49ab: docs: de-new sidenavs
* commit '
9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
docs: de-new sidenavs
Robert Ly [Wed, 13 Jul 2011 21:54:44 +0000 (14:54 -0700)]
am
4e400158: am
1e4cf2dd: am
10a36020: cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
* commit '
4e4001589911b971d56c72acee140526d4575dac':
cherrypick from hc-mr1 Change-Id: Ib0d980c95d821ba24e342f230b4a47fd786ba66a
Scott Main [Wed, 13 Jul 2011 21:54:24 +0000 (14:54 -0700)]
am
22f4e8f6: am
56a085c9: am
d3fa7bd1: docs: fix date on opengl dashboard
* commit '
22f4e8f627e3f54b418da422eadcf0c43caa3499':
docs: fix date on opengl dashboard
Xavier Ducrohet [Wed, 13 Jul 2011 21:53:54 +0000 (14:53 -0700)]
Dave Santoro [Wed, 29 Jun 2011 07:25:16 +0000 (00:25 -0700)]
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
Mike Lockwood [Wed, 13 Jul 2011 21:33:13 +0000 (14:33 -0700)]
Merge "MediaScanner: fix breakage in updates"
Robert Ly [Wed, 13 Jul 2011 21:28:52 +0000 (14:28 -0700)]
Merge "docs: fix for bug
3186839"
Robert Ly [Wed, 13 Jul 2011 21:25:52 +0000 (14:25 -0700)]
docs: fix for bug
3186839
Change-Id: I28305b73f0fe02593e072d690471a1448eb4c675
Svetoslav Ganov [Wed, 13 Jul 2011 21:19:33 +0000 (14:19 -0700)]
Merge "Polish of the ActivityChooserView and ShareActionProvider."
Wink Saville [Wed, 13 Jul 2011 21:19:12 +0000 (14:19 -0700)]
am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
Wink Saville [Wed, 13 Jul 2011 21:15:19 +0000 (14:15 -0700)]
Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
Andreas Huber [Wed, 13 Jul 2011 19:38:46 +0000 (12:38 -0700)]
Remove old-style software decoders.
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
repo sync [Wed, 13 Jul 2011 21:09:33 +0000 (14:09 -0700)]
Merge "Add REFER handling."
Chris Craik [Wed, 13 Jul 2011 21:08:11 +0000 (14:08 -0700)]
Merge "Tile profiling interface"
Mathias Agopian [Wed, 13 Jul 2011 21:07:01 +0000 (14:07 -0700)]
Merge "get rid of overlay HAL"
Svetoslav Ganov [Thu, 7 Jul 2011 00:17:52 +0000 (17:17 -0700)]
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
Mike Lockwood [Wed, 13 Jul 2011 20:50:29 +0000 (16:50 -0400)]
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>
Wink Saville [Wed, 13 Jul 2011 20:44:13 +0000 (13:44 -0700)]
Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.
Bug:
4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
Chris Craik [Wed, 13 Jul 2011 20:19:37 +0000 (13:19 -0700)]
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
Jeff Brown [Wed, 13 Jul 2011 20:00:38 +0000 (13:00 -0700)]
Merge "Revert "fix a weird use of Vector::appendVector()""
Jeff Brown [Wed, 13 Jul 2011 19:51:11 +0000 (12:51 -0700)]
Revert "fix a weird use of Vector::appendVector()"
This reverts commit
198fd888add624cf9e53ce31b776568a5d069916
This change seems to have exposed some other bugs.
Bug:
5026631
Jaikumar Ganesh [Wed, 13 Jul 2011 19:29:57 +0000 (12:29 -0700)]
resolved conflicts for merge of
ab3ec176 to honeycomb-plus-aosp
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
Jason Sams [Wed, 13 Jul 2011 19:28:38 +0000 (12:28 -0700)]
Merge "Add slot number to forEach hal."
Jason Sams [Wed, 13 Jul 2011 18:26:26 +0000 (11:26 -0700)]
Add slot number to forEach hal.
Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c
Jaikumar Ganesh [Wed, 13 Jul 2011 17:25:27 +0000 (10:25 -0700)]
am
9ff89495: am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
9ff89495a4890191a0bc5dfddf28f23f79f23698':
Bluetooth: correcting return value from cancelDiscovery
Jaikumar Ganesh [Wed, 13 Jul 2011 17:22:40 +0000 (10:22 -0700)]
am
53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
* commit '
53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
John Wang [Wed, 13 Jul 2011 17:21:38 +0000 (10:21 -0700)]
am
2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '
2ac78a2da52b29f6ac72294072d7ca87d991dab1':
Add getImei() to Phone interface.
John Wang [Wed, 13 Jul 2011 17:17:22 +0000 (10:17 -0700)]
Merge "Add getImei() to Phone interface." into honeycomb-LTE
Jaikumar Ganesh [Wed, 13 Jul 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Bluetooth: correcting return value from cancelDiscovery"
Kenny Root [Wed, 13 Jul 2011 16:49:43 +0000 (09:49 -0700)]
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
Kenny Root [Wed, 13 Jul 2011 16:48:33 +0000 (09:48 -0700)]
Add StorageVolume list to MountService dump
Change-Id: If2be6e420d9671032d2e7a66c71a6733e6e48ac8
Andreas Huber [Wed, 13 Jul 2011 16:36:11 +0000 (09:36 -0700)]
Enable signalling of a stream discontinuity involving a format-change
through IStreamListener.
Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug:
5022434
Mike Lockwood [Wed, 13 Jul 2011 15:07:59 +0000 (08:07 -0700)]
Merge "MTP: Clean up MtpServer initialization and threading:"
Mike Lockwood [Wed, 13 Jul 2011 14:34:29 +0000 (07:34 -0700)]
Merge "UsbDeviceManager: clean up HandlerThread creation"
Narayan Kamath [Wed, 13 Jul 2011 14:30:27 +0000 (07:30 -0700)]
Merge "Wait until the audio track finishes playing before releasing it."
Mike Lockwood [Mon, 11 Jul 2011 19:04:38 +0000 (15:04 -0400)]
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
Mike Lockwood [Wed, 13 Jul 2011 13:23:45 +0000 (09:23 -0400)]
UsbDeviceManager: clean up HandlerThread creation
Change-Id: I84683b1753fcf3c3b501f8a506d6d890edf2eb37
Signed-off-by: Mike Lockwood <lockwood@android.com>
Narayan Kamath [Wed, 13 Jul 2011 12:59:45 +0000 (13:59 +0100)]
Wait until the audio track finishes playing before releasing it.
Release calls stop, which causes truncation of playback.
bug:
5021056
Change-Id: I8eadcbf5622dab83be3c4dabfcc06629398f27ab
Jeff Sharkey [Wed, 13 Jul 2011 03:23:03 +0000 (20:23 -0700)]
Merge "Include full network history around current time."
Jeff Sharkey [Wed, 13 Jul 2011 03:20:56 +0000 (20:20 -0700)]
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
Romain Guy [Wed, 13 Jul 2011 02:10:22 +0000 (19:10 -0700)]
Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant.""
Romain Guy [Wed, 13 Jul 2011 02:09:03 +0000 (19:09 -0700)]
Revert "Don't preload HardwareRenderer, its static initialization is process dependant."
This reverts commit
821e24336b3ab1f902fc3ee8da423226f50b540c.
Fabrice Di Meglio [Wed, 13 Jul 2011 01:24:27 +0000 (18:24 -0700)]
Merge "Introduce TextView drawableStart and drawableEnd"
Romain Guy [Wed, 13 Jul 2011 01:18:11 +0000 (18:18 -0700)]
Merge "Don't preload HardwareRenderer, its static initialization is process dependant."
Romain Guy [Wed, 13 Jul 2011 01:16:35 +0000 (18:16 -0700)]
Don't preload HardwareRenderer, its static initialization is process dependant.
Change-Id: I229357aaaa10b19209983c122f98dd3c07e01d7f
Iliyan Malchev [Wed, 13 Jul 2011 00:40:25 +0000 (17:40 -0700)]
Merge "Add support for TI H264 encoder"
Mathias Agopian [Wed, 13 Jul 2011 00:36:22 +0000 (17:36 -0700)]
Merge "take the state transform into account with h/w composer hal"
Chia-chi Yeh [Tue, 12 Jul 2011 23:58:45 +0000 (16:58 -0700)]
am
3b219a51: (-s ours) am
4821d3bd: Merge "VpnService: stop VPN when unknown DNS servers show up." into honeycomb-LTE
* commit '
3b219a51a9d692807d3fb0f516df81609ca6e4fc':
VpnService: stop VPN when unknown DNS servers show up.
Elliott Hughes [Tue, 12 Jul 2011 23:58:18 +0000 (16:58 -0700)]
Merge "Fix typo in AndroidHttpClient JavaDoc."