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
Wink Saville
3810361e4a
am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
...
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-13 14:19:12 -07:00
Fabrice Di Meglio
fe7e40dc0d
Fix bug #5025936 TableLayout layout direction resolution is broken
...
- check is the parent's view can do resolution when there is inheritance
Change-Id: Ic21d4ee761982ee219229a95f170b6bf2e596b02
2011-07-13 14:15:35 -07:00
Wink Saville
6d1d16c324
Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
2011-07-13 14:15:19 -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
Wink Saville
e822225f7a
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
2011-07-13 13:44:13 -07: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
Jaikumar Ganesh
6dd4531639
resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
...
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
2011-07-13 12:29:57 -07:00
Jason Sams
3ac60ada27
Merge "Add slot number to forEach hal."
2011-07-13 12:28:38 -07:00
Elliott Hughes
b9eba866b2
Fix aidl to cope with multiple collection types per method.
...
Bug: http://code.google.com/p/android/issues/detail?id=18497
Change-Id: I152416022524d2860cb16b46c4812c5be6bdcbad
2011-07-13 12:10:30 -07:00
Jason Sams
92b0eab07e
Add slot number to forEach hal.
...
Change-Id: I0f2992d5f4128422d07f897b335c219cc7f1d02c
2011-07-13 11:26:26 -07:00
Jaikumar Ganesh
ab3ec17608
am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
...
* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
Bluetooth: correcting return value from cancelDiscovery
2011-07-13 10:25:27 -07:00
Jaikumar Ganesh
9ff89495a4
am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"
...
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
Bluetooth: correcting return value from cancelDiscovery
2011-07-13 10:22:40 -07:00
John Wang
28d92afc0a
am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
...
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
Add getImei() to Phone interface.
2011-07-13 10:21:38 -07:00
John Wang
2ac78a2da5
Merge "Add getImei() to Phone interface." into honeycomb-LTE
2011-07-13 10:17:22 -07:00
Jaikumar Ganesh
53cf7858c3
Merge "Bluetooth: correcting return value from cancelDiscovery"
2011-07-13 10:04:19 -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
Mathias Agopian
a7b28df5f0
Merge "take the state transform into account with h/w composer hal"
2011-07-12 17:36:22 -07:00
Chia-chi Yeh
995ab4caf2
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.
2011-07-12 16:58:45 -07:00
Elliott Hughes
0d5f971245
Merge "Fix typo in AndroidHttpClient JavaDoc."
2011-07-12 16:58:18 -07:00
Gilles Debunne
5292a9d0a0
Merge "Refactored TextView selectable state methods."
2011-07-12 16:38:51 -07:00
Wink Saville
c4f5d33ea6
am 0ddd9960: am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
...
* commit '0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
Add a property so that CSIM provision check can be bypassed
2011-07-12 16:38:22 -07:00
Gilles Debunne
459ac63ada
Bug 5014726: Paste works in ExtractedText
...
Change-Id: I3eb72001662cf9df0a94377f98ba22b19c490fa4
2011-07-12 16:36:33 -07:00
Alex Sakhartchouk
5b7da3d3df
Merge "Fix for the renderscript ref counting bug."
2011-07-12 16:27:09 -07:00