Commit Graph

18269 Commits

Author SHA1 Message Date
Marco Nelissen
b89a986dd9 am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Marco Nelissen
448aadc2c7 Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread 2010-09-17 15:39:00 -07:00
Dianne Hackborn
e5e647f98e am 58e0eefe: Improve power tracking of WIFI use.
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp

* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
  Improve power tracking of WIFI use.
2010-09-17 15:20:10 -07:00
John Wang
9ce04dbeb2 am 0741a5ed: Merge "Add debug function." into gingerbread
Merge commit '0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp

* commit '0741a5ed38757ef2f6b52945ad494d965b3b83de':
  Add debug function.
2010-09-17 15:06:44 -07:00
John Wang
116d91b4aa Merge "Add debug function." into gingerbread 2010-09-17 15:03:01 -07:00
Adam Powell
b68a497479 am b08013c3: Added overlay support for drawing/responding to text anchors.
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp

* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
  Added overlay support for drawing/responding to text anchors.
2010-09-17 14:53:43 -07:00
Jeff Brown
8d5bf38892 am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit '838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp

* commit '838e93ed19879ce3d88b5be51630137d6a6999c6':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 13:30:20 -07:00
Jeff Brown
e0e09d4771 Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread 2010-09-17 13:25:55 -07:00
Chet Haase
400a478227 am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp

* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
  new assets
2010-09-17 13:14:58 -07:00
Chet Haase
14811c08df Merge "new assets" into gingerbread 2010-09-17 13:10:54 -07:00
Andreas Huber
ec118a4760 am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp

* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 12:50:45 -07:00
Andreas Huber
0b81a4309d am 524e6f62: Register the new OMX components.
Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp

* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
  Register the new OMX components.
2010-09-17 12:50:35 -07:00
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
Jeff Brown
b0619e8ad8 Looper: Drop default parameters in favor of a safer overload.
The idea is that if you're writing code that wants fd/events/data on
return from pollOnce() / pollAll() you should really pass in all of those
arguments.  When I changed the Looper API earlier, it was difficult
to ensure that all callers were passing the right parameters since they
were relying on default parameters to some degree so usage mistakes
would not have been caught by the compiler.

Change-Id: I1f2812894270aaf1515017ac1616b6b312d9b565
2010-09-16 18:51:15 -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