Romain Guy
0a81b17fbf
am d2c78b39: Fix the build.
...
* commit 'd2c78b39724d1d7b6e4f7bd54d0022c2847e9127':
Fix the build.
2011-01-10 15:00:23 -08:00
Romain Guy
d2c78b3972
Fix the build.
...
Change-Id: Ief8734697e8fdacb6fdbfdbd78793e06beb86d26
2011-01-10 15:01:13 -08:00
Subir Jhanb
ebc5f20a26
am e896be71: Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:3337128
...
* commit 'e896be71c70c7aaa86886fec1044c53e93c42621':
Making the sync manager take the data connected value from ConnectivityManager and not from the intent. BUG:3337128
2011-01-10 14:40:01 -08:00
Subir Jhanb
e896be71c7
Making the sync manager take the data connected value from ConnectivityManager and not from the intent.
...
BUG:3337128
Change-Id: Ife2705569fcdde1b201773d6622a8a9d0b7ccfa1
2011-01-10 14:18:09 -08:00
Stephen Hines
bf11e22684
am d94988bb: Merge "Split time functions into rs_time.rsh header." into honeycomb
...
* commit 'd94988bb0cc65e5de71ab3c43ddf26e5c72dbc32':
Split time functions into rs_time.rsh header.
2011-01-10 14:16:26 -08:00
Stephen Hines
d94988bb0c
Merge "Split time functions into rs_time.rsh header." into honeycomb
2011-01-10 14:14:35 -08:00
Romain Guy
67c796da27
am 778f5f95: Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb
...
* commit '778f5f95d7f74ac12bc426c37dd1fc7abc05e15b':
Make sure onCancelled() is called if cancel() is called early.
2011-01-10 13:41:45 -08:00
Elliott Hughes
85a46c91f9
am 6452c259: Merge "Remove tests for dead API." into honeycomb
...
* commit '6452c259e0547bcb5aede8d52e1307ee8cf86d89':
Remove tests for dead API.
2011-01-10 13:41:41 -08:00
Romain Guy
778f5f95d7
Merge "Make sure onCancelled() is called if cancel() is called early." into honeycomb
2011-01-10 13:39:41 -08:00
Elliott Hughes
6452c259e0
Merge "Remove tests for dead API." into honeycomb
2011-01-10 13:39:30 -08:00
Romain Guy
5ba812b9e9
Make sure onCancelled() is called if cancel() is called early.
...
In some situations, when cancel() was called before the task had a
chance to start its execution, onCancelled() would not be invoked.
Change-Id: I6c1f4cd28a209fb8cc779bb212f500565dfceaae
2011-01-10 13:33:12 -08:00
Jesse Wilson
48526d6994
am eb97c0dd: Patch new JSON APIs with changes informed by GSON.
...
* commit 'eb97c0ddc063176c26065fc6855188edf0c16e03':
Patch new JSON APIs with changes informed by GSON.
2011-01-10 12:59:59 -08:00
Elliott Hughes
ffcac1a127
Remove tests for dead API.
...
We removed the implementation, so there's no point trying to test it. (The
methods are still there for binary compatibility, which is why this still
compiled.)
Change-Id: I51f392f3dab542fca0c80fab4974354e2c689b9e
2011-01-10 12:57:36 -08:00
Jesse Wilson
eb97c0ddc0
Patch new JSON APIs with changes informed by GSON.
...
Change-Id: I86c12a123080cc06ab23d11d1563bb52c5902517
2011-01-10 12:56:31 -08:00
Gilles Debunne
e79ea1dbc7
am b3fbd7e0: Merge "Stop text selection mode when new text replaces selection." into honeycomb
...
* commit 'b3fbd7e0fd44a72fb7ccba0959481b8a806608b7':
Stop text selection mode when new text replaces selection.
2011-01-10 12:51:25 -08:00
Gilles Debunne
b3fbd7e0fd
Merge "Stop text selection mode when new text replaces selection." into honeycomb
2011-01-10 12:49:23 -08:00
Leon Scroggins
f5f13669bb
am e0b19124: Merge "Do not store the find callback until action mode starts." into honeycomb
...
* commit 'e0b1912480d3c5cfa3f4cf3dd9d7cddd10d68c63':
Do not store the find callback until action mode starts.
2011-01-10 12:47:11 -08:00
Jamie Gennis
164cb00d96
am fbab3b67: Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb
...
* commit 'fbab3b67afc904450613204400d9e8779feb5659':
Fix a bug in SurfaceTexture::setBufferCount.
2011-01-10 12:47:06 -08:00
Jamie Gennis
61e2ef0721
am ffe3f1cb: Merge "Add method logging to the SurfaceTexture C++ class." into honeycomb
...
* commit 'ffe3f1cb16d37e56ab69ad345f47c6d3f52b916c':
Add method logging to the SurfaceTexture C++ class.
2011-01-10 12:47:03 -08:00
Jamie Gennis
3d25b74a87
am c936c5ce: Merge "Initialize the SurfaceTexture buffer slots." into honeycomb
...
* commit 'c936c5cec648cd60637275fc6dba2265ae446044':
Initialize the SurfaceTexture buffer slots.
2011-01-10 12:47:00 -08:00
Leon Scroggins
e0b1912480
Merge "Do not store the find callback until action mode starts." into honeycomb
2011-01-10 12:41:20 -08:00
Jamie Gennis
fbab3b67af
Merge "Fix a bug in SurfaceTexture::setBufferCount." into honeycomb
2011-01-10 12:30:33 -08:00
Jamie Gennis
ffe3f1cb16
Merge "Add method logging to the SurfaceTexture C++ class." into honeycomb
2011-01-10 12:30:14 -08:00
Jamie Gennis
c936c5cec6
Merge "Initialize the SurfaceTexture buffer slots." into honeycomb
2011-01-10 12:29:51 -08:00
Leon Scroggins
19abf2d7a5
Do not store the find callback until action mode starts.
...
Bug:3331652
Prevents a bug where showFindDialog was apparently
called twice.
Change-Id: Ida473ef1b9b1b8b641fa3432b55d7a92eb7d0808
2011-01-10 15:29:01 -05:00
Andy McFadden
d0a4c69e2a
am 155b552b: Merge "Fix start-time setreuid complaints." into honeycomb
...
* commit '155b552b1d7b8ff705c325ee435022cc135f6486':
Fix start-time setreuid complaints.
2011-01-10 12:08:43 -08:00
Andy McFadden
155b552b1d
Merge "Fix start-time setreuid complaints." into honeycomb
2011-01-10 12:07:03 -08:00
Andreas Huber
0c12065f03
am b736cb28: Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
...
* commit 'b736cb28ab414c16b9cd89923a6da3778847cf2a':
Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
2011-01-10 12:02:35 -08:00
Andreas Huber
b736cb28ab
Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
...
Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
2011-01-10 11:57:30 -08:00
Gilles Debunne
d94f8c5055
Stop text selection mode when new text replaces selection.
...
Rationalized the use of hideControllers and stopSelectionActionMode.
Hiding the selection controller should be done exclusively by stoping text selection
mode.
Bug 3322636
Change-Id: I30b4a651aa5fb5a865d636bec495a2b96ef114cd
2011-01-10 11:29:15 -08:00
Andreas Huber
b1914aece8
am 748ba9a9: Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
...
* commit '748ba9a9512dee65d5b09cfe26a34ded753f4aab':
NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
2011-01-10 11:28:44 -08:00
Andreas Huber
748ba9a951
Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
2011-01-10 11:26:38 -08:00
Andy McFadden
05554a4ee9
Fix start-time setreuid complaints.
...
The code was checking errno instead of the return value from the call.
This fixes calls to setreuid(), setregid(), and setpgid().
Bug 3131052
Change-Id: I8b6155bd4fa9b941895b35fed62cfc163b420fff
2011-01-10 11:22:43 -08:00
Leon Scroggins
0efb38b479
am 9cac3c31: Remove the option to use shift to start selection mode.
...
* commit '9cac3c31d29134f9bf4de10765b81ed45c13d31a':
Remove the option to use shift to start selection mode.
2011-01-10 11:05:19 -08:00
Leon Scroggins
9cac3c31d2
Remove the option to use shift to start selection mode.
...
Bug:3329956
Also ensure that keys dispatched while the WebTextView
is attached get sent to the WebTextView.
Change-Id: Icd9125a85929089a6f376b71c1cb40e885264168
2011-01-10 13:57:38 -05:00
Xavier Ducrohet
723cf6d3f6
am 5c6b786e: Merge "LayoutLib: display warning when a resource reference fails to resolve." into honeycomb
...
* commit '5c6b786e1c1a103fe3f80b294ac166da1555fffa':
LayoutLib: display warning when a resource reference fails to resolve.
2011-01-10 10:57:18 -08:00
Xavier Ducrohet
49a6653f00
am 0f83b571: Merge "LayoutLib: Fix moveChild animation." into honeycomb
...
* commit '0f83b571e294a443a992cdf71bc5e6aaf7464d39':
LayoutLib: Fix moveChild animation.
2011-01-10 10:55:17 -08:00
Xavier Ducrohet
5c6b786e1c
Merge "LayoutLib: display warning when a resource reference fails to resolve." into honeycomb
2011-01-10 10:54:18 -08:00
Xavier Ducrohet
0f83b571e2
Merge "LayoutLib: Fix moveChild animation." into honeycomb
2011-01-10 10:53:37 -08:00
Andreas Huber
7caa130a98
NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
...
Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d
related-to-bug: 3336496
2011-01-10 10:38:31 -08:00
Gilles Debunne
917369844f
am 58f750ad: Merge "Fix for an NPE in Account settings on long press." into honeycomb
...
* commit '58f750ad145e6920c1c75bed8b333e54d78f3fed':
Fix for an NPE in Account settings on long press.
2011-01-10 10:15:48 -08:00
James Dong
faa75436ef
am be0ae5ea: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
...
* commit 'be0ae5ea135539f044f660b4a4d5105e14574804':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
2011-01-10 10:13:40 -08:00
Gilles Debunne
58f750ad14
Merge "Fix for an NPE in Account settings on long press." into honeycomb
2011-01-10 10:12:59 -08:00
James Dong
be0ae5ea13
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
2011-01-10 10:11:18 -08:00
Adam Cohen
1613b5ba7b
am 4c894519: Merge "Fixing bug where StackView doesn\'t clip it\'s children correctly" into honeycomb
...
* commit '4c8945191c60a92123c3df15a1f0a737a7084449':
Fixing bug where StackView doesn't clip it's children correctly
2011-01-10 10:08:19 -08:00
Adam Cohen
4c8945191c
Merge "Fixing bug where StackView doesn't clip it's children correctly" into honeycomb
2011-01-10 10:06:19 -08:00
Adam Cohen
488672148c
Fixing bug where StackView doesn't clip it's children correctly
...
Change-Id: Icb051fa355c5c1b92f81d56f04efd4f8699c65a4
2011-01-10 10:04:01 -08:00
Gilles Debunne
b0db5940c9
Fix for an NPE in Account settings on long press.
...
Bug 3333512
Change-Id: Ief79e824b86b964598f00ef74c6b5c61c0730242
2011-01-10 10:00:37 -08:00
Cary Clark
0c62f82bbb
am b74e32cc: Merge "add more alt key acceleration in webview" into honeycomb
...
* commit 'b74e32cc7ded9b26c1ba1e1bcff98fc9e7128562':
add more alt key acceleration in webview
2011-01-10 09:57:02 -08:00
Cary Clark
b74e32cc7d
Merge "add more alt key acceleration in webview" into honeycomb
2011-01-10 09:55:54 -08:00