54713 Commits

Author SHA1 Message Date
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
Jeff Sharkey
0d32528be3 Release strong Fragment references after exec.
When finished with a Runnable transaction in execPendingActions(),
release the strong reference so that Fragment can be GC'ed.

Bug: 3117761
Change-Id: Ica2f50e363be1bd047bf0474b293efeb814b1264
2011-07-13 09:36:46 -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
Mathias Agopian
6e62dba519 get rid of overlay HAL
Change-Id: I461f633d172ab10e05326ef10544c67dea664c0e
2011-07-12 16:04:12 -07:00
Elliott Hughes
7b91b31e28 Fix typo in AndroidHttpClient JavaDoc.
Bug: http://code.google.com/p/android/issues/detail?id=14788
Change-Id: I7465c6c42e7b208efc9c954ac46c1b683676106e
2011-07-12 16:02:50 -07:00
Jaikumar Ganesh
30e8f98277 Merge "Add REGISTERED_BEFORE_BOOT flag to intent." 2011-07-12 15:54:50 -07:00
Dandawate Saket
e641dc502b Add support for TI H264 encoder
Add support for TI H264 encoder and quirks for buffer allocation.
Temporary switching to baseline profile till ctts patch is defaulted
as per profile detection.

Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-07-12 15:50:28 -07:00
Jeff Sharkey
f0c3b1b6b7 Merge "Hide NetworkStatsHistory internals." 2011-07-12 15:19:31 -07:00
Jeff Sharkey
099b3d2179 Merge "Watch for external Secure.DATA_ROAMING changes." 2011-07-12 15:18:41 -07:00
Adam Powell
9a845ee425 Merge "Update ActionProvider to support dynamically building submenus." 2011-07-12 15:08:37 -07:00
android-merger
9a5e57af4a temporary revert for testing
Revert "Implement dead service recovery in NFC extras library."

This reverts commit cc9ee72bd42bb40b1852f907f58305adde12ecc2.
2011-07-12 15:00:45 -07:00
android-merger
95a08eaf08 reset, and keep history 2011-07-12 14:59:32 -07:00
Kazuhiro Ondo
64bd196fe4 am a9e00a4a: am 89799e72: Fix incorrect ERI banner format
* commit 'a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
  Fix incorrect ERI banner format
2011-07-12 14:56:59 -07:00
Mathias Agopian
9e37abb636 take the state transform into account with h/w composer hal
if the state transform didn't preserve rectangles, we
would still try to use h/w composer hal using the bounds
of the transformed rect, which isn't correct.

now we correctly fall back to composition.

Change-Id: Iff78f4339ece415d4987e95a5717b04934d370ab
2011-07-12 14:51:45 -07:00
Wink Saville
474c924379 Merge "resolved conflicts for merge of 99cd6671 to master" 2011-07-12 14:46:02 -07:00