Mike Lockwood
9f22e65f80
am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
...
* commit 'af64e751e2373790dd661be80b11a03332712e90':
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
2011-03-17 16:24:53 -07:00
Xia Wang
601cf70eb9
am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
...
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
Port wi-fi stress test into GB DO NOT MERGE
2011-03-17 16:21:28 -07:00
Xavier Ducrohet
c8f07bae1f
am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
...
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
Merge 67450db0 from honeycomb. Do not merge.
2011-03-17 16:21:20 -07:00
Mike Lockwood
6dd337b9f1
am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:20:56 -07:00
Simon Wilson
41c48eef34
am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
...
* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
DO NOT MERGE Add images to ERI icon list
2011-03-17 16:20:46 -07:00
Mike Lockwood
2ce416b5d2
am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
...
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
2011-03-17 16:20:32 -07:00
James Dong
29c6574d45
Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
2011-03-17 16:11:13 -07:00
Xia Wang
0d2b3fe91d
Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
2011-03-17 15:06:40 -07:00
James Dong
5f7204cb66
Fix missing AOSP copyright headers for more files
...
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
because these two files were moved from other places to the current location,
and were actually created in 2010.
bug - 4119349
Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
2011-03-17 14:43:12 -07:00
Teng-Hui Zhu
3bc0feb989
am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
...
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
Fix the aspect ratio for full screen playing
2011-03-17 14:23:38 -07:00
Teng-Hui Zhu
3e8fac41f4
am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
...
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
Fix the aspect ratio for full screen playing
2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
691935bfcd
Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1
2011-03-17 14:20:39 -07:00
Xavier Ducrohet
a4710e7d8e
am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
...
* commit 'a0215953b0a6930b0ca3dcbdd598e1b9de2e9f02':
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
2011-03-17 14:18:48 -07:00
Xavier Ducrohet
0eb5f29a5d
am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
...
* commit '026d6be2dcc425f83d9d7ec8740068147497b305':
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
2011-03-17 14:15:38 -07:00
Xavier Ducrohet
fdebf54854
Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1
2011-03-17 14:12:49 -07:00
Eric Fischer
06964efbd9
am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'b05fea7dc586173d5dcf7980e51966ac4ae761a0':
Import revised translations. DO NOT MERGE
2011-03-17 13:36:38 -07:00
Eric Fischer
9fe43705c7
am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
Import revised translations. DO NOT MERGE
2011-03-17 13:32:58 -07:00
Eric Fischer
d4c0f4ec71
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-17 13:29:47 -07:00
James Dong
b747834201
am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
...
* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade':
Fix missing AOSP copyright headers for a bunch of media framework files
2011-03-17 12:31:09 -07:00
Gloria Wang
590d5971a1
am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
...
* commit '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
2011-03-17 12:30:52 -07:00
James Dong
892c399bdc
am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
...
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
Fix missing AOSP copyright headers for a bunch of media framework files
2011-03-17 11:56:05 -07:00
Gloria Wang
95a8679095
am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
...
* commit 'def35f7a47cde8bf66d4cba4570b289e0e9d625a':
Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
2011-03-17 10:54:00 -07:00
Gloria Wang
3e99aa92cb
Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
2011-03-17 10:49:43 -07:00
Brad Fitzpatrick
8fa2e62dd3
am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'b8332786e3ac6d58504a7c3128e94e63255b3515':
Removing dead store; it was likely a relict of debuging code.
2011-03-17 10:36:47 -07:00
Paul Milovanov
892ce1fe33
am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:29:50 -07:00
Paul Milovanov
7c4c1cc17a
am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:26:32 -07:00
Paul Milovanov
c7112b9ef8
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
2011-03-17 10:23:48 -07:00
Brad Fitzpatrick
25fd80d611
am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
...
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
Removing dead store; it was likely a relict of debuging code.
2011-03-17 10:18:15 -07:00
Brad Fitzpatrick
64069d47d8
Merge "Removing dead store; it was likely a relict of debuging code."
2011-03-17 09:51:47 -07:00
Mike Lockwood
7832a8571a
am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
...
* commit 'c97022e7acc6da71e558e9137036622b4c77ca46':
MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:28:26 -07:00
Mike Lockwood
ba47878adf
am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
...
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:26:44 -07:00
Mike Lockwood
973c0ad411
Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
2011-03-17 07:24:12 -07:00
Daniel Sandler
8fc90fc888
am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
...
* commit '4502636629ebb3f2ebb8521241c364666d1d7345':
Remove logspew.
2011-03-17 06:35:54 -07:00
Daniel Sandler
9abaf18427
am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1
...
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
Remove logspew.
2011-03-17 06:31:56 -07:00
Daniel Sandler
7d96e2657e
Merge "Remove logspew." into honeycomb-mr1
2011-03-17 06:23:45 -07:00
Adam Powell
8af3fb35d5
am ea775ca3: am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'ea775ca3ac793033e91b4d1cc05dfdb53ab807be':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:39:44 -07:00
Adam Powell
84391e64c8
am f8d1533b: Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
...
* commit 'f8d1533b07b51935e295b2cf92e2ea2aa94b303f':
Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow
2011-03-17 01:38:15 -07:00
Adam Powell
c985885653
Merge "Fix bug 4111271 and bug 4077526 - WebView touch event handling when WebCore is too slow" into honeycomb-mr1
2011-03-17 01:36:47 -07:00
Jeff Brown
a67bdc7c2c
am 244eb34a: am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
...
* commit '244eb34a6712688fa87653dd3e2e2d05cd568eec':
Fix dangling pointer when device closed just after opening.
2011-03-17 01:02:28 -07:00
Jeff Brown
cd00ac8d55
am d98f8aff: Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
...
* commit 'd98f8aff731123eef1f0a8bc8bfc917647d5ac3a':
Fix dangling pointer when device closed just after opening.
2011-03-17 01:00:36 -07:00
Jeff Brown
8fb4327df3
Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1
2011-03-17 00:59:08 -07:00
Mathias Agopian
679c2bc790
am 25594e19: am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
* commit '25594e1984125081878d2ea057700366a34a8ccf':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:12:01 -07:00
Mathias Agopian
9260be0e79
am f40e638e: fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
* commit 'f40e638ec62cd9e1a1851809b7c8bf5e4187fad2':
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
2011-03-17 00:10:10 -07:00
Mathias Agopian
d0b55c011a
fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondition(LockCondition) timed out
...
a memory corruption happned when the buffer pool was resized
(like when playing a video or using camera) and there was
no current active buffer. In this case, the faulty code
would index into an array at position -1 which corrupted
24 bytes of data.
also improved region validation code (ifdef'ed out by default)
Bug: 4093196
Change-Id: I915c581d131148959d720e00e3892e9186ab733d
2011-03-17 00:04:42 -07:00
Teng-Hui Zhu
fc3d156784
am 7a0949c6: am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7a0949c60df2085fc38eea71d78f9c17eb26cd65':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:05:41 -07:00
Teng-Hui Zhu
4fd8d4cbce
am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:03:04 -07:00
Teng-Hui Zhu
d5b7248aed
Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
2011-03-16 23:01:03 -07:00
Bart Sears
f3850c0015
am 247820c0: am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '247820c0a756413986643a0ed9a8d446afc747ee':
partial inval
2011-03-16 21:52:23 -07:00
Bart Sears
0c457ee474
am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
partial inval
2011-03-16 21:50:52 -07:00
Bart Sears
b5ff32a575
Merge "partial inval" into honeycomb-mr1
2011-03-16 21:49:09 -07:00