Hung-ying Tyan
5ef59746b6
am 1d158357: SipPhone: do not append SIP domain to PSTN number
...
Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp
* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
SipPhone: do not append SIP domain to PSTN number
2010-09-17 02:03:39 -07:00
Hung-ying Tyan
7538760ca7
am afa583e6: SipAudioCall: expose startAudio()
...
Merge commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp
* commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7':
SipAudioCall: expose startAudio()
2010-09-17 01:01:07 -07:00
Tadashi G. Takaoka
63f042cd80
am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
...
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp
* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:03:32 -07:00
Tadashi G. Takaoka
c2f4b6096d
Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
2010-09-17 00:01:19 -07:00
Brian Carlstrom
3fcfb4e68b
am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
...
Merge commit '987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp
* commit '987ba54127caaaa87056965b3d98b7e1a5b110b7':
Fix sim-eng build on Hardy
2010-09-16 23:51:31 -07:00
Brian Carlstrom
ce802e33d4
Merge "Fix sim-eng build on Hardy" into gingerbread
2010-09-16 23:48:53 -07:00
Hung-ying Tyan
92f2512e41
am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
...
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp
* commit '9404e633a55cd325b57732cdd776053b3886b611':
Add timer to SIP session creation process.
2010-09-16 23:40:28 -07:00
Hung-ying Tyan
38c55b6080
Merge "Add timer to SIP session creation process." into gingerbread
2010-09-16 23:30:49 -07:00
Mathias Agopian
9ebbaec708
am 36f429d3: Fix typo which causes sensors to fail miserably
...
Merge commit '36f429d300be2550d7459b488dfc05b00ec59312' into gingerbread-plus-aosp
* commit '36f429d300be2550d7459b488dfc05b00ec59312':
Fix typo which causes sensors to fail miserably
2010-09-16 22:16:02 -07:00
Jake Hamby
f5da5e0c69
am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.
...
Merge commit '0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp
* commit '0f5843069bd419fba4fb253986645dfbca0784b7':
Fix Bluetooth Javadoc to clarify the maximum device name length.
2010-09-16 22:15:55 -07:00
Mathias Agopian
2ffb24799e
Fix typo which causes sensors to fail miserably
...
Change-Id: Ieca18fc089e2bdf7d049f213836971b54d11cd76
2010-09-16 21:41:13 -07:00
Mathias Agopian
c05246ae34
am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread
...
Merge commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69' into gingerbread-plus-aosp
* commit '1bcb8b1afbfa2fc387a0f7068740f1efbe9a1f69':
surfaceflinger / GL extensions cleanup
2010-09-16 17:57:34 -07:00
Mathias Agopian
11bed4a776
am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
...
Merge commit '08710dcd589432c5828cefce25e4b565b15de9a6' into gingerbread-plus-aosp
* commit '08710dcd589432c5828cefce25e4b565b15de9a6':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 17:57:29 -07:00
Mathias Agopian
a51d696ad4
am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
...
Merge commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34' into gingerbread-plus-aosp
* commit '079ed61579c3c42d78bb20cbcb11e6ffdb2aff34':
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 17:57:25 -07:00
Mathias Agopian
888db4d60b
Merge "surfaceflinger / GL extensions cleanup" into gingerbread
2010-09-16 17:55:05 -07:00
Jesse Wilson
78e7edc2aa
am 14836fb1: Merge "Add optional tags to frameworks/base ext." into gingerbread
...
Merge commit '14836fb17335b147ebc8081fea11fda0d46ce532' into gingerbread-plus-aosp
* commit '14836fb17335b147ebc8081fea11fda0d46ce532':
Add optional tags to frameworks/base ext.
2010-09-16 17:54:55 -07:00
Mathias Agopian
9e110d532f
Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work" into gingerbread
2010-09-16 17:54:50 -07:00
Mathias Agopian
f78bc52c85
Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
2010-09-16 17:54:42 -07:00
Jesse Wilson
9a21b26971
Merge "Add optional tags to frameworks/base ext." into gingerbread
2010-09-16 17:52:29 -07:00
Mathias Agopian
aeda9afdba
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
...
- In SensorEventQueue, only bail on errors from Looper::loopOnce
- Improve sensor error logging
Change-Id: Ib3cf8d5d9fdac8513a3d753155827e0feeda1662
2010-09-16 17:33:48 -07:00
Jeff Brown
916bdb2a78
am 1ac48eab: Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
...
Merge commit '1ac48eabd39e0cfd087ddf2c3b6ba8e56803bdd4' into gingerbread-plus-aosp
* commit '1ac48eabd39e0cfd087ddf2c3b6ba8e56803bdd4':
Ensure input dispatcher and native looper handles EINTR.
2010-09-16 17:15:54 -07:00
Jeff Brown
bec4e2cff7
am 9c258710: Merge "Fix app switch latency optimization." into gingerbread
...
Merge commit '9c2587104ae259b9fa6a3525063197cc08e8820b' into gingerbread-plus-aosp
* commit '9c2587104ae259b9fa6a3525063197cc08e8820b':
Fix app switch latency optimization.
2010-09-16 17:15:48 -07:00
Jeff Brown
3b6dda9e19
Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
2010-09-16 17:12:31 -07:00
Jeff Brown
42f6ea4f5e
Merge "Fix app switch latency optimization." into gingerbread
2010-09-16 17:12:24 -07:00
Jeff Brown
f67f299036
Ensure input dispatcher and native looper handles EINTR.
...
Change-Id: I0a42db5f273b9bfe4ab174e4ee65d5d852f9f6bc
2010-09-16 17:04:52 -07:00
Carl Shapiro
3a22b2da05
am 4b164c1b: Kill off the remaining GC-specific system properties.
...
Merge commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c' into gingerbread-plus-aosp
* commit '4b164c1bf3592d4d83d93a5de58bb09676f1462c':
Kill off the remaining GC-specific system properties.
2010-09-16 16:57:37 -07:00
Jeff Brown
d8816c3c4c
Fix app switch latency optimization.
...
This optimization was broken due to recent changes in how ANRs are handled.
Change-Id: Ic99248a12755fadac8d4893e7d305b773e038d3d
2010-09-16 16:41:46 -07:00
Brian Carlstrom
17563f9fb3
Fix sim-eng build on Hardy
...
Older glibc version do not include BSD htole32 and htole64 which are
present in bionic. This worksaround a sim-eng build issue by only
using htole32/htole64 if the host is not little endian.
Change-Id: Ia8d0d36285f3c34c51a331790458e52a21c2925f
2010-09-16 16:28:13 -07:00
Andreas Huber
92ef19bf83
am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread
...
Merge commit 'a7516e90d01a22d17a470695eefa905e0ff066cc' into gingerbread-plus-aosp
* commit 'a7516e90d01a22d17a470695eefa905e0ff066cc':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
2010-09-16 16:02:33 -07:00
Andreas Huber
5ce129557d
am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread
...
Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp
* commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
2010-09-16 16:02:25 -07:00
Jeff Brown
4094d00f86
am 6abea1eb: Remove fields no longer in API.
...
Merge commit '6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3' into gingerbread-plus-aosp
* commit '6abea1ebc29c7bc8397f0470d57a4e485b5d4ee3':
Remove fields no longer in API.
2010-09-16 15:30:18 -07:00
Andreas Huber
73aa9002a9
Merge "Make sure the .wav extractor does not read data outside the bounds of the 'data' box." into gingerbread
2010-09-16 15:20:33 -07:00
Andreas Huber
b15450e343
Merge "Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)" into gingerbread
2010-09-16 15:20:21 -07:00
Joe Onorato
229635a6e7
am b01e10c5: There is no @note javadoc tag.
...
Merge commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2' into gingerbread-plus-aosp
* commit 'b01e10c5bc0a29d1b0da96783b6d1582baeb2af2':
There is no @note javadoc tag.
2010-09-16 15:00:50 -07:00
Steve Howard
7cf9bc124f
am 47874718: Merge "Support new URI structure for download provider." into gingerbread
...
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp
* commit '478747181e0414d703076d4786b201718cd93d5b':
Support new URI structure for download provider.
2010-09-16 13:45:51 -07:00
Steve Howard
3435d3bb55
Merge "Support new URI structure for download provider." into gingerbread
2010-09-16 13:42:34 -07:00
Jeff Brown
cb6a0c6832
am 24326f72: Merge "Input API review." into gingerbread
...
Merge commit '24326f7223275ba9c85014b86d42040e3a7d2815' into gingerbread-plus-aosp
* commit '24326f7223275ba9c85014b86d42040e3a7d2815':
Input API review.
2010-09-16 13:01:54 -07:00
Jeff Brown
128e33421b
Merge "Input API review." into gingerbread
2010-09-16 12:57:56 -07:00
Jeff Brown
8505b801e0
am b9eb949b: Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbread
...
Merge commit 'b9eb949bcae977a3f86e8307f3854f157227c34c' into gingerbread-plus-aosp
* commit 'b9eb949bcae977a3f86e8307f3854f157227c34c':
Fix input dispatcher regression on launcher drag&drop.
2010-09-16 12:40:30 -07:00
Jeff Brown
f5ca35e583
Merge "Fix input dispatcher regression on launcher drag&drop." into gingerbread
2010-09-16 12:38:31 -07:00
Jeff Brown
405a1d32e9
Fix input dispatcher regression on launcher drag&drop.
...
Change-Id: I40e937bd712cd2ed6cceac95dfd1b8c8e070724f
2010-09-16 12:31:46 -07:00
Joe Onorato
02e3c9e69e
am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread
...
Merge commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c' into gingerbread-plus-aosp
* commit 'ad7bce4ca236393cc2d9ab115cea5a267724f10c':
DO NOT MERGE - Doclava warnings are now errors.
2010-09-16 11:49:39 -07:00
James Dong
b5792edc93
am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread
...
Merge commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b' into gingerbread-plus-aosp
* commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b':
Fixed a bug in the query to the supported profiles and levels
2010-09-16 11:47:17 -07:00
Joe Onorato
95cc90b601
Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread
2010-09-16 11:45:34 -07:00
James Dong
7e6085f270
Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread
2010-09-16 11:45:01 -07:00
Andreas Huber
2b9f9821b1
am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
...
Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp
* commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
2010-09-16 11:36:12 -07:00
Andreas Huber
2cd0ad397b
Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
2010-09-16 11:32:25 -07:00
Joe Onorato
faedd14a3a
am d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread
...
Merge commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7' into gingerbread-plus-aosp
* commit 'd5d1328690b8f274059954e3c1bc9008c4e02dd7':
This was marked @Deprecated in the docs, but it was misspelled.
2010-09-16 11:29:09 -07:00
Joe Onorato
d0b88ef384
Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread
2010-09-16 11:26:30 -07:00
Dirk Dougherty
c8f05b0d1f
am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
...
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp
* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
Doc change: clean up droiddoc (cs) macros.
2010-09-16 11:19:54 -07:00