Mike Lockwood
7fa24aa8da
MountService: Add support for multiple volumes
...
Change-Id: I4eaa781cf302c7aaae170af2489b6b29120c0b81
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-04 18:53:58 -04:00
Chet Haase
d4dd7025a1
Fix bug with values in cloned animators.
...
When a ValueAnimator is cloned, we correctly clone the underlying
PropertyValuesHolder objects and assign them to the new object.
However, we then put values into the new property map using the
old values instead of the new ones. This means that the per-property
animated values cannot be retrieved with the property names from
the cloned animator, because the map refers to the values of the
original object, not the cloned object that is actually being animated.
Fix is easy: just put the cloned values (which are already being created)
into the map.
Change-Id: I81282ca1dab6b1767ddc894d57a1110b344b4b0a
2011-04-04 15:33:55 -07:00
Robert Greenwalt
1254e7a357
am da8beef5: am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
* commit 'da8beef55612738d87d6aa520445377a9e4ae784':
Fix Default route after secondary net use.
2011-04-04 15:28:56 -07:00
Brad Fitzpatrick
9a9adb5d25
am 5851b866: am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
...
* commit '5851b8662dc95372d68df293cb13c59da0cf8582':
Fix data corruption when writing to Bluetooth socket
2011-04-04 15:28:54 -07:00
Brad Fitzpatrick
bc20ac85a5
am e511fb33: am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
...
* commit 'e511fb33d33f0ba83ce437f615fa236f369b5ade':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 15:28:51 -07:00
Brad Fitzpatrick
37334c0f34
am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
...
* commit '8f7aad147d790b25bae7301827e070df72690341':
Avoid crash in system server when mounting container
2011-04-04 15:28:48 -07:00
Robert Greenwalt
da8beef556
am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
Fix Default route after secondary net use.
2011-04-04 15:25:45 -07:00
Brad Fitzpatrick
5851b8662d
am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
...
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
Fix data corruption when writing to Bluetooth socket
2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
e511fb33d3
am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
...
* commit '9b1b64399502af0a08beac3014f2294644753602':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
8f7aad147d
am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"
...
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
Avoid crash in system server when mounting container
2011-04-04 15:25:21 -07:00
Robert Greenwalt
38a1345b8d
am 549177e4: Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '549177e4f3f5e2a92e1431c157cebb985068a5ee':
Fix bad merge.
2011-04-04 15:12:13 -07:00
Robert Greenwalt
549177e4f3
Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-04-04 15:07:41 -07:00
Robert Greenwalt
ffe8723ca2
resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp
...
Change-Id: Ide9ed301618b89a1cced4885062c13047980890c
2011-04-04 15:00:13 -07:00
Alex Sakhartchouk
78a9f6a822
Merge "First draft of fbo in renderscript. Updating samples and benchmark"
2011-04-04 14:33:19 -07:00
Gilles Debunne
fb2e9d23e0
Merge "IME is no longer shown when an EditText gets focus."
2011-04-04 14:25:45 -07:00
Roman Nurik
f5d41653a7
am 84967294: am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
...
* commit '84967294f25d223ff2c5e62378b40f20fd853c4c':
Document support for .TS video containers.
2011-04-04 13:51:18 -07:00
Roman Nurik
84967294f2
am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
...
* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
Document support for .TS video containers.
2011-04-04 13:47:34 -07:00
Roman Nurik
9131557721
am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
...
* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
Document support for .TS video containers.
2011-04-04 13:44:23 -07:00
Roman Nurik
5a41a8a0fd
Merge "Document support for .TS video containers." into honeycomb-mr1
2011-04-04 13:41:11 -07:00
Elliott Hughes
763006af3e
Merge "You can't fsync(2) /dev/urandom..."
2011-04-04 12:55:58 -07:00
Roman Nurik
c1b34f3d8e
Document support for .TS video containers.
...
Change-Id: I99a2da97ce2bbb79beb4a7b5847ad3de90a6b7af
2011-04-04 12:51:18 -07:00
Andreas Huber
dc5ba0451c
Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491"
2011-04-04 12:45:23 -07:00
Eric Laurent
b7a76e84fd
am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
...
* commit 'a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
Issue 4157048: mic gain for VoIP/SIP calls.
2011-04-04 12:25:37 -07:00
Mike Lockwood
179122ad56
am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
...
* commit 'a8731e1e922512e5c22485e48059f33b61ab93ea':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
2011-04-04 12:25:33 -07:00
Trevor Johns
ea477d2043
am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
...
* commit 'cafbe87d5b6108d71e85950796b587f95d00cfac':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-04-04 12:25:29 -07:00
Simon Wilson
d7a8e8453d
am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 12:25:25 -07:00
Eric Fischer
d20023ae44
am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE
2011-04-04 12:20:38 -07:00
Jason parks
1d73362597
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Justin Ho
0f5e36deee
am 87805ca3: Updated CDMA roaming icons
...
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
Updated CDMA roaming icons
2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
0c61e10590
am bef31431: No-op - reconcile with open-source gingerbread
...
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
2011-04-04 12:19:26 -07:00
Robert Greenwalt
ab2194aade
am 27725e8c: Only leave one default network up at a time.
...
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Elliott Hughes
6907891b1f
You can't fsync(2) /dev/urandom...
...
...so don't even try. Doing so leads to this:
W/EntropyService( 1586): unable to load initial entropy (first boot?)
W/EntropyService( 1586): java.io.SyncFailedException: fsync failed: EINVAL (Invalid argument)
W/EntropyService( 1586): at java.io.FileDescriptor.sync(FileDescriptor.java:73)
W/EntropyService( 1586): at java.io.RandomAccessFile.write(RandomAccessFile.java:694)
W/EntropyService( 1586): at java.io.RandomAccessFile.write(RandomAccessFile.java:676)
W/EntropyService( 1586): at com.android.server.RandomBlock.toDataOut(RandomBlock.java:88)
W/EntropyService( 1586): at com.android.server.RandomBlock.toFile(RandomBlock.java:70)
W/EntropyService( 1586): at com.android.server.EntropyService.loadInitialEntropy(EntropyService.java:99)
W/EntropyService( 1586): at com.android.server.EntropyService.<init>(EntropyService.java:86)
W/EntropyService( 1586): at com.android.server.EntropyService.<init>(EntropyService.java:76)
W/EntropyService( 1586): at com.android.server.ServerThread.run(SystemServer.java:139)
W/EntropyService( 1586): Caused by: libcore.io.ErrnoException: fsync failed: EINVAL (Invalid argument)
W/EntropyService( 1586): at libcore.io.Posix.fsync(Native Method)
W/EntropyService( 1586): at libcore.io.BlockGuardOs.fsync(BlockGuardOs.java:39)
W/EntropyService( 1586): at java.io.FileDescriptor.sync(FileDescriptor.java:71)
W/EntropyService( 1586): ... 8 more
Change-Id: I598a9456eccec0ca087f1568d47b6b8e531de8a8
2011-04-04 12:15:34 -07:00
Adam Cohen
fd125f0c4b
Merge "Fixing build"
2011-04-04 12:12:25 -07:00
Adam Cohen
f45f5b2715
Fixing build
...
Change-Id: If18012c03265f3fa02d8743d583668d9e0245845
2011-04-04 12:08:58 -07:00
Andreas Huber
284b831d15
Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock."
2011-04-04 12:00:20 -07:00
Robert Ly
c474031642
am cbfeda13: am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
...
* commit 'cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
Adding package description for android.hardware.usb
2011-04-04 11:55:23 -07:00
Robert Ly
cbfeda13e7
am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
...
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
Adding package description for android.hardware.usb
2011-04-04 11:48:51 -07:00
Andreas Huber
c6e3b27fa1
This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491
...
Instead of returning 0-filled buffers after EOS from AudioTrack we do this
work in AudioOutput instead. That way the EOS signal (0 frames returned)
is preserved in AudioCache which otherwise would lead to a heap size overflow
filling everything with zeroes.
Change-Id: I7e07429ba887957a4340dd4b21eef4bba76248cd
related-to-bug: 3514073
2011-04-04 11:43:40 -07:00
Robert Ly
6f7e4cb5ae
am 3f39f653: Adding package description for android.hardware.usb
...
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb
2011-04-04 11:41:02 -07:00
Andreas Huber
8e64c31f6c
Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock.
...
Change-Id: Idfea452ff661b264e013fe515bcd2a2762bd959c
related-to-bug: 4193552
2011-04-04 11:29:35 -07:00
Adam Cohen
4b6bf80fad
Merge "Making StackView res-out and click feedback colors stylable"
2011-04-04 11:27:07 -07:00
Robert Greenwalt
37229514c5
Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
2011-04-04 11:23:51 -07:00
Robert Greenwalt
d685c731bf
resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp
...
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
2011-04-04 11:21:23 -07:00
Robert Ly
3f39f653a9
Adding package description for android.hardware.usb
...
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
2011-04-04 11:07:46 -07:00
Brad Fitzpatrick
27e00544ea
am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
...
* commit '9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket
2011-04-04 11:03:03 -07:00
Gilles Debunne
c5a43594ba
IME is no longer shown when an EditText gets focus.
...
Change-Id: Ife24f83831f97c911e4e800547182a390cda0d75
2011-04-04 10:57:47 -07:00
Brad Fitzpatrick
9907d16158
Merge "Fix data corruption when writing to Bluetooth socket"
2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
9b1b643995
am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
...
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
f7a34b1598
am e558a000: Merge "Avoid crash in system server when mounting container"
...
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
2ed7204882
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
2011-04-04 09:41:10 -07:00