Mathias Agopian
99ce457320
am 8f476407: am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
...
Merge commit '8f476407bf4e6283b128532d594d44cc527e8204'
* commit '8f476407bf4e6283b128532d594d44cc527e8204':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 18:26:13 -07:00
Mathias Agopian
7bb3e78ff3
am 3a35f078: am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
...
Merge commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933'
* commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933':
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 18:26:09 -07:00
Jesse Wilson
2f6d37c2b5
Merge "resolved conflicts for merge of d78f338e to master"
2010-09-16 18:22:59 -07:00
Jason Sams
4ffde2b041
Merge "Cleanup GL setup code and remove legacy 1.1 paths. Reset pointers to NULL when allocations are unbound."
2010-09-16 18:21:29 -07:00
Jesse Wilson
98a6abf7e3
resolved conflicts for merge of d78f338e to master
...
Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
2010-09-16 18:21:20 -07:00
Jason Sams
d081fffab5
Cleanup GL setup code and remove legacy 1.1 paths.
...
Reset pointers to NULL when allocations are unbound.
Change-Id: Ifaba634ecbb154970b7fb47faa8e6475d16d2f66
2010-09-16 18:18:29 -07:00
Jason Sams
f8438a7db0
Merge "Fix race condition on exit."
2010-09-16 18:10:41 -07:00
Mathias Agopian
8f476407bf
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
3a35f078e7
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
Jesse Wilson
d78f338e26
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
08710dcd58
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
079ed61579
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
14836fb173
Merge "Add optional tags to frameworks/base ext." into gingerbread
2010-09-16 17:52:29 -07:00
Jesse Wilson
a145956551
Add optional tags to frameworks/base ext.
...
Change-Id: I08a69b7ca783994e52f735ad0ee9b85197cdaa96
2010-09-16 17:50:43 -07:00
Mathias Agopian
4d3cb63b9b
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
ec8ae3ce1a
am d3576ef8: am 1ac48eab: Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
...
Merge commit 'd3576ef8906798d91da3ee88a103f4bedcab169e'
* commit 'd3576ef8906798d91da3ee88a103f4bedcab169e':
Ensure input dispatcher and native looper handles EINTR.
2010-09-16 17:29:57 -07:00
Jeff Brown
711f82784f
am 6f0ff46c: am 9c258710: Merge "Fix app switch latency optimization." into gingerbread
...
Merge commit '6f0ff46c6f1fd1b61325b545ab9e93c5ebf37d25'
* commit '6f0ff46c6f1fd1b61325b545ab9e93c5ebf37d25':
Fix app switch latency optimization.
2010-09-16 17:29:46 -07:00
Carl Shapiro
3bf23a7b9f
am b0abf3ea: am 4b164c1b: Kill off the remaining GC-specific system properties.
...
Merge commit 'b0abf3ea47b74296fd790843e789cfd101f58a00'
* commit 'b0abf3ea47b74296fd790843e789cfd101f58a00':
Kill off the remaining GC-specific system properties.
2010-09-16 17:29:41 -07:00
Andreas Huber
09a985187a
am 92aa28ad: am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread
...
Merge commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9'
* commit '92aa28addd5dbe576b2c1b66cbc00c561402f2b9':
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
2010-09-16 17:29:30 -07:00
Andreas Huber
58fc6e51ad
am 23c6ad7a: 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 '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0'
* commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
2010-09-16 17:29:23 -07:00
Jeff Brown
b6f349adab
am c09cea39: am 6abea1eb: Remove fields no longer in API.
...
Merge commit 'c09cea3931bfd61eb0fee7eb09f51ede27212722'
* commit 'c09cea3931bfd61eb0fee7eb09f51ede27212722':
Remove fields no longer in API.
2010-09-16 17:29:11 -07:00
Joe Onorato
57491d746f
am d47761ea: am b01e10c5: There is no @note javadoc tag.
...
Merge commit 'd47761ea869f3fcaee18c5a25d1d79e4173b84a3'
* commit 'd47761ea869f3fcaee18c5a25d1d79e4173b84a3':
There is no @note javadoc tag.
2010-09-16 17:29:05 -07:00
Mathias Agopian
ec33b82c42
fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
...
- Sensor handle can now be arbitrary instead of being limited to 0-31
- make sure to disable sensors only when no listener uses them anymore
Change-Id: If656c8c24d9827a7db1de3b3aa89961abb7def0c
2010-09-16 17:21:08 -07:00
Jeff Brown
d3576ef890
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
6f0ff46c6f
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
1ac48eabd3
Merge "Ensure input dispatcher and native looper handles EINTR." into gingerbread
2010-09-16 17:12:31 -07:00
Jeff Brown
9c2587104a
Merge "Fix app switch latency optimization." into gingerbread
2010-09-16 17:12:24 -07:00
Adam Cohen
15e9145477
Merge "Fixing StackView rendering bug exposed by recent Launcher change"
2010-09-16 17:05:16 -07:00
Jeff Brown
7dae0e47ab
Ensure input dispatcher and native looper handles EINTR.
...
Change-Id: I0a42db5f273b9bfe4ab174e4ee65d5d852f9f6bc
2010-09-16 17:04:52 -07:00
Winson Chung
eaa867a33f
Merge "Prevent multiple RemoteViewAdapters from being set for the same intent."
2010-09-16 17:02:19 -07:00
Winson Chung
9b3a2cf2a0
Prevent multiple RemoteViewAdapters from being set for the same intent.
...
Fixing issue where we were comparing and storing intents incorrectly in the RemoteViewsService reference counting scheme.
Change-Id: Iedf5997ed3a3ee7f8729cf8689121913196571f8
2010-09-16 16:59:56 -07:00
Carl Shapiro
b0abf3ea47
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
Carl Shapiro
4b164c1bf3
Kill off the remaining GC-specific system properties.
...
Change-Id: Ib09ef132c6fb99b9eb22ecfd75a910c9c0f01e25
2010-09-16 16:48:21 -07:00
Jason Sams
a8bf9429b2
Fix race condition on exit.
...
Change-Id: I1ae1818122604dde5993b2b8ef702bda5194d87d
2010-09-16 16:45:55 -07:00
Jeff Brown
54a1825121
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
Gil Dobjanschi
ec7291c99f
Merge "Initial Video Editor API"
2010-09-16 16:40:12 -07:00
Andreas Huber
92aa28addd
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
23c6ad7aed
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
c09cea3931
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
Adam Cohen
b7f4d030a2
Fixing StackView rendering bug exposed by recent Launcher change
...
Change-Id: Ic8aad699afb75842d63be39e6586a6b23997aef8
2010-09-16 15:27:20 -07:00
Andreas Huber
a7516e90d0
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
549629d366
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
Gil Dobjanschi
fdacc8be92
Initial Video Editor API
...
Change-Id: Iaa91e78d0e50f45ceb943bab93c4f1ea1bdee003
2010-09-16 15:19:46 -07:00
Joe Onorato
d47761ea86
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
Andreas Huber
6bfb397dff
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
...
Change-Id: Iec809df89e6b75706cf5b1ce21006c2e217e018f
2010-09-16 14:55:48 -07:00
Andreas Huber
4f5bb1e699
Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
...
Change-Id: Icf18f9224d97e6a78328dd429ebc3a3433e5cecd
related-to-bug: 3007790
2010-09-16 14:54:10 -07:00
Romain Guy
c5958f8a65
Merge "Snap layer bounds to pixel boundaries."
2010-09-16 14:43:11 -07:00
Romain Guy
bf434114cb
Snap layer bounds to pixel boundaries.
...
Change-Id: I272ceebf469a119f01ea9d73cdd68519afdffa99
2010-09-16 14:40:17 -07:00
Jeff Brown
6abea1ebc2
Remove fields no longer in API.
...
Change-Id: I4a5f932fefe045678a539874d11705a1a726bd94
2010-09-16 14:38:20 -07:00
Romain Guy
885b1f21d9
Merge "Better error handling in the OpenGL renderer."
2010-09-16 14:18:22 -07:00