Commit Graph

36670 Commits

Author SHA1 Message Date
Daniel Lehmann
fd7d7a11b9 Merge "Allow a sync adapter to provide an OPEN action for a group" 2011-07-13 15:40:03 -07:00
Christopher Tate
a9122b65a7 Merge "Compress the backup output stream" 2011-07-13 15:37:21 -07:00
Christopher Tate
a100c02b8d 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
89dd4b5beb Merge "Control socket tagging through Settings.Secure." 2011-07-13 15:28:06 -07:00
Andreas Huber
e984b07c50 Merge "Remove old-style software decoders." 2011-07-13 15:19:44 -07:00
David 'Digit' Turner
a74e2aa3bc 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
8ca5b5e007 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
b045e1e69c 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
856b69f4d4 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
8d6b8ef68c am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
  Merge 36a3a392 from mr1.
2011-07-13 14:53:54 -07:00
Mike Lockwood
801a6dfa8a Merge "MediaScanner: fix breakage in updates" 2011-07-13 14:33:13 -07:00
Robert Ly
1ba8f1ddc7 Merge "docs: fix for bug 3186839" 2011-07-13 14:28:52 -07:00
Svetoslav Ganov
e9ac0770ca Merge "Polish of the ActivityChooserView and ShareActionProvider." 2011-07-13 14:19:33 -07:00
Wink Saville
91249c1ef7 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
Wink Saville
a411e3d108 Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 2011-07-13 14:15:19 -07:00
repo sync
4de78aa114 Merge "Add REFER handling." 2011-07-13 14:09:33 -07:00
Chris Craik
5fc4e6db41 Merge "Tile profiling interface" 2011-07-13 14:08:11 -07:00
Mathias Agopian
27a4dd912c Merge "get rid of overlay HAL" 2011-07-13 14:07:01 -07:00
Jeff Brown
4bb2be88b2 Merge "Revert "fix a weird use of Vector::appendVector()"" 2011-07-13 13:00:38 -07:00
Jaikumar Ganesh
a4994b2c1d resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
2011-07-13 12:29:57 -07:00
Jason Sams
f42716c281 Merge "Add slot number to forEach hal." 2011-07-13 12:28:38 -07:00
Jaikumar Ganesh
99a444e731 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
04b363802f 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
edcceea8c3 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
a94755393f Merge "Add getImei() to Phone interface." into honeycomb-LTE 2011-07-13 10:17:22 -07:00
Jaikumar Ganesh
95c15bacf5 Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-07-13 10:04:19 -07:00
Mike Lockwood
cec2be4554 Merge "MTP: Clean up MtpServer initialization and threading:" 2011-07-13 08:07:59 -07:00
Mike Lockwood
80daa8e298 Merge "UsbDeviceManager: clean up HandlerThread creation" 2011-07-13 07:34:29 -07:00
Narayan Kamath
299ee398e5 Merge "Wait until the audio track finishes playing before releasing it." 2011-07-13 07:30:27 -07:00
Jeff Sharkey
ca11c2fd9f Merge "Include full network history around current time." 2011-07-12 20:23:03 -07:00
Romain Guy
ed74eeb6ff Merge "Revert "Don't preload HardwareRenderer, its static initialization is process dependant."" 2011-07-12 19:10:22 -07:00
Fabrice Di Meglio
c76ebf52db Merge "Introduce TextView drawableStart and drawableEnd" 2011-07-12 18:24:27 -07:00
Romain Guy
77e1b188aa Merge "Don't preload HardwareRenderer, its static initialization is process dependant." 2011-07-12 18:18:11 -07:00
Iliyan Malchev
82f6e53a2d Merge "Add support for TI H264 encoder" 2011-07-12 17:40:25 -07:00
Mathias Agopian
ab6d387787 Merge "take the state transform into account with h/w composer hal" 2011-07-12 17:36:22 -07:00
Chia-chi Yeh
15a99db8de 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
db9586b132 Merge "Fix typo in AndroidHttpClient JavaDoc." 2011-07-12 16:58:18 -07:00
Gilles Debunne
10101c6ff1 Merge "Refactored TextView selectable state methods." 2011-07-12 16:38:51 -07:00
Wink Saville
3f9271d33b 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
Alex Sakhartchouk
22d7ffa392 Merge "Fix for the renderscript ref counting bug." 2011-07-12 16:27:09 -07:00
Jaikumar Ganesh
19657cd711 Merge "Add REGISTERED_BEFORE_BOOT flag to intent." 2011-07-12 15:54:50 -07:00
Jeff Sharkey
56cdb8d5e0 Merge "Hide NetworkStatsHistory internals." 2011-07-12 15:19:31 -07:00
Jeff Sharkey
fe687edb22 Merge "Watch for external Secure.DATA_ROAMING changes." 2011-07-12 15:18:41 -07:00
Adam Powell
ee8f144485 Merge "Update ActionProvider to support dynamically building submenus." 2011-07-12 15:08:37 -07:00
Kazuhiro Ondo
1aa3512492 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
29a367bb7c 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
1bf4bff3cf Merge "resolved conflicts for merge of 99cd6671 to master" 2011-07-12 14:46:02 -07:00
James Dong
838cf46df7 Merge "Make MetadataBufferType.h C-friendly" 2011-07-12 14:43:34 -07:00
Svetoslav Ganov
b3d93f45c7 Merge "Date/time pickers and calendar view not handling locale change." 2011-07-12 14:39:07 -07:00
Mathias Agopian
a58d703cae Merge "fix typo in a comment" 2011-07-12 14:11:57 -07:00