Commit Graph

41855 Commits

Author SHA1 Message Date
Mike Lockwood
becb04902d Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage" 2011-12-02 08:17:33 -08:00
Mike Lockwood
57c27b9023 Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" 2011-12-02 08:10:03 -08:00
The Android Open Source Project
8002c53144 Reconcile with ics-mr1-release
Change-Id: I1c603308272f9b00174c3f9046171e069ffee566
2011-12-02 07:53:10 -08:00
Ben Cheng
a63ee4c2fd am f1a4c48b: am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
* commit 'f1a4c48b886d53e2afceb0620215e3792af79fd5':
  Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
2011-12-01 22:08:20 -08:00
Ben Cheng
11fc6ba3bf am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
* commit 'e21dabf654e3d90e50e95174d5e9670bc930c194':
  Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
2011-12-01 22:06:32 -08:00
Ben Cheng
d2e9b6b007 Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1 2011-12-01 22:05:07 -08:00
Jeff Brown
6c8f6fb565 Merge "Refactor InputQueue as InputEventReceiver." 2011-12-01 21:09:49 -08:00
Eric Laurent
177fad0bc4 am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
* commit '6cfa9e6c507a721f647518569c89db9560056079':
  AudioService: strengthen A2DP device detection
2011-12-01 20:38:15 -08:00
Eric Laurent
5523e21f4e am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
  AudioService: strengthen A2DP device detection
2011-12-01 20:35:26 -08:00
Eric Laurent
c603733c20 Merge "AudioService: strengthen A2DP device detection" into ics-mr1 2011-12-01 20:34:08 -08:00
Jeff Brown
ec332d806e Merge "Ensure input events are processed in-order in the application." 2011-12-01 20:11:15 -08:00
Jeff Brown
fc93e69186 Merge "Improve latency instrumentation." 2011-12-01 20:11:09 -08:00
Romain Guy
b08ec05bd5 Merge "Faster text clipping" 2011-12-01 20:09:57 -08:00
Dianne Hackborn
ab399bb285 am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1
* commit '48e07296800c49f8bc9b34cc57372593021f79a1':
  More social integration.
2011-12-01 18:52:27 -08:00
Dianne Hackborn
d9f8d1650d am bfb3dec2: Merge "More social integration." into ics-mr1
* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
  More social integration.
2011-12-01 18:50:36 -08:00
Dianne Hackborn
5405705e67 Merge "More social integration." into ics-mr1 2011-12-01 18:48:32 -08:00
Stephen Hines
5e9277b461 am 88c02e8c: am 976ae272: Add support for handling a bitcode wrapper to librs.
* commit '88c02e8c5d30c053a4faa897e322540f61914718':
  Add support for handling a bitcode wrapper to librs.
2011-12-01 18:25:20 -08:00
Stephen Hines
d2bfb577eb am 976ae272: Add support for handling a bitcode wrapper to librs.
* commit '976ae27270a64c5abeb380d6e61d6d71f29b9433':
  Add support for handling a bitcode wrapper to librs.
2011-12-01 18:10:29 -08:00
Ben Cheng
d640f89205 Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
I/valgrind( 1309): ==1310== Syscall param
ioctl(BINDER_WRITE_READ).read_buffer points to uninitialised byte(s)
I/valgrind( 1309): ==1310==    at 0x480E670: __ioctl (__ioctl.S:10)
I/valgrind( 1309): ==1310==  Address 0xbda651b4 is on thread 1's stack

Change-Id: I02893df7b5786b6b2dbd9659f5706d7171295ab2
2011-12-01 17:11:32 -08:00
The Android Automerger
364c359833 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 16:45:56 -08:00
Gilles Debunne
2e406a92d1 am b4812f8a: am 335c4e6c: Broken build. New methods made private.
* commit 'b4812f8a815a4c4a9896e73412f4011d7a30f03f':
  Broken build. New methods made private.
2011-12-01 16:10:03 -08:00
Gilles Debunne
56b3e46b8b am 335c4e6c: Broken build. New methods made private.
* commit '335c4e6cb2094c7cbd6039e0c7915702b69e7657':
  Broken build. New methods made private.
2011-12-01 16:06:51 -08:00
Gilles Debunne
93f73c6f1f am 120cb5af: am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
* commit '120cb5afd345a97c5e43683232c857ce2e5c8f29':
  Scroll performance improved in multiline TextEdit
2011-12-01 15:09:00 -08:00
Gilles Debunne
c39de1ec9a am ee8862dc: am eb189d39: Merge "Performance improvement in TextView" into ics-mr1
* commit 'ee8862dc7b7266ee99633e0f13b2393a2185c30d':
  Performance improvement in TextView
2011-12-01 15:08:58 -08:00
Gilles Debunne
3dae6ef5cc am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
* commit '58d8953958ce452c5080eaa582d7e5d2b5017398':
  Scroll performance improved in multiline TextEdit
2011-12-01 15:07:10 -08:00
Gilles Debunne
44f60b17b1 am eb189d39: Merge "Performance improvement in TextView" into ics-mr1
* commit 'eb189d399a459c2e1ad29e1beba70d1de9f447b3':
  Performance improvement in TextView
2011-12-01 15:07:08 -08:00
Gilles Debunne
1005ecb2f6 am a8205d24: am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1
* commit 'a8205d24703fc353076cf30795b3a06a87208cfa':
  Better handles' visibility test
2011-12-01 15:06:49 -08:00
Gilles Debunne
a36dc6304f am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1
* commit '09cbff0294a27d33c93de50e0b4471ad86154a84':
  Better handles' visibility test
2011-12-01 15:04:46 -08:00
Gilles Debunne
afdc18bb0c Merge "Scroll performance improved in multiline TextEdit" into ics-mr1 2011-12-01 15:04:35 -08:00
Gilles Debunne
d72b461ae6 Merge "Performance improvement in TextView" into ics-mr1 2011-12-01 15:03:55 -08:00
Gilles Debunne
ff8f841f12 Merge "Better handles' visibility test" into ics-mr1 2011-12-01 15:03:27 -08:00
Winson Chung
d6d43bce7f am ecdc38be: am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1
* commit 'ecdc38be1ef6ee5375ff6abe92f2e1e84a78ea57':
  Adding a sound when you take a screenshot. (Bug 5617734)
2011-12-01 14:59:45 -08:00
Winson Chung
7c04bd23cb am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1
* commit 'cea32ecd3aef013bc5da6e401eeb8e9e8cd1b595':
  Adding a sound when you take a screenshot. (Bug 5617734)
2011-12-01 14:57:50 -08:00
Winson Chung
21a50fdd03 Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1 2011-12-01 14:55:41 -08:00
Kenny Root
596b44b773 am 7f36d421: am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
* commit '7f36d4217269e79f8409c46f12f10464a1f585ea':
  Fix free_cache to actually work
2011-12-01 14:18:58 -08:00
Kenny Root
82930f32bb am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
  Fix free_cache to actually work
2011-12-01 14:16:18 -08:00
Kenny Root
c9fc27fd05 Merge "Fix free_cache to actually work" into ics-mr1 2011-12-01 14:14:22 -08:00
Glenn Kasten
63912ea0ed Merge "Add README for media "automated" tests" 2011-12-01 13:55:41 -08:00
Roman Nurik
c37a4fb135 am aeda641e: am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit 'aeda641e331e86f86b19493f9e5c1be38a45f5db':
  Update widget design guidelines for padding and 8dp.
2011-12-01 13:47:29 -08:00
Roman Nurik
09d510a088 am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit 'a7d825dddcb2e8bfd765bad2fb406498f4f1e37e':
  Update widget design guidelines for padding and 8dp.
2011-12-01 13:44:41 -08:00
Roman Nurik
b97464208e am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e':
  Update widget design guidelines for padding and 8dp.
2011-12-01 13:42:23 -08:00
Roman Nurik
845715a005 Merge "Update widget design guidelines for padding and 8dp." into ics-mr0 2011-12-01 13:40:38 -08:00
Matthew Xie
7eff3ac928 am 6001d3ad: am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '6001d3ad9f5ddb5be09ec6e70b5e646cb9a0f469':
  Unlink the Binder DeathRecipient when removing a Bluetooth service record
2011-12-01 13:36:48 -08:00
Matthew Xie
89610203c3 am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
  Unlink the Binder DeathRecipient when removing a Bluetooth service record
2011-12-01 13:34:18 -08:00
Matthew Xie
3c418d0c7b Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1 2011-12-01 13:32:19 -08:00
Jeff Sharkey
b5be1ac09d Merge "Uniform rethrowing of NDC exceptions." 2011-12-01 13:27:38 -08:00
Svetoslav Ganov
ea31c68b4e am 0bfdd7c2: am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
* commit '0bfdd7c2927fb683b89fdd52befe643e8e069e77':
  Fix memory leaks in the accessibility layer.
2011-12-01 13:01:50 -08:00
Svetoslav Ganov
de8f840dec am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
* commit 'e9f24a43021734d28a4f65ebc804847b31ce13e8':
  Fix memory leaks in the accessibility layer.
2011-12-01 12:59:11 -08:00
Svetoslav Ganov
314043ac17 Merge "Fix memory leaks in the accessibility layer." into ics-mr1 2011-12-01 12:57:12 -08:00
Dianne Hackborn
d34ed1a5eb am c4c19a23: am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
* commit 'c4c19a23d74896b4117bf274d1d7e0268ab401c3':
  Improve how we manage the previous app.
2011-12-01 12:52:07 -08:00