ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,200 Commits 2 Branches 0 Tags 54 MiB
fe0a0af7bd
Commit Graph

21200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
fe0a0af7bd am 793b2293: am 1bcb8b1a: Merge "surfaceflinger / GL extensions cleanup" into gingerbread 
Merge commit '793b2293797ea930078640c4827d3cbdf449c227'

* commit '793b2293797ea930078640c4827d3cbdf449c227':
  surfaceflinger / GL extensions cleanup
 2010-09-16 18:26:19 -07:00
Mathias Agopian
281c975dbf 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
7f5948d1e3 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
ac2bf67a00 Merge "resolved conflicts for merge of d78f338e to master" 2010-09-16 18:22:59 -07:00
Jason Sams
e611741288 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
931928b256 resolved conflicts for merge of d78f338e to master 
Change-Id: Ibe4be94126df9f1ea999b0396351886161552960
 2010-09-16 18:21:20 -07:00
Jason Sams
12965a88e1 Merge "Fix race condition on exit." 2010-09-16 18:10:41 -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
339f69889f 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
54e9a7ec0b 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
2b48cb04f3 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
d624329669 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
22142423cc 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
5d4e5c553c 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
ac40f06d87 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
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
Adam Cohen
5f64a8a7b0 Merge "Fixing StackView rendering bug exposed by recent Launcher change" 2010-09-16 17:05:16 -07:00
Jeff Brown
f67f299036 Ensure input dispatcher and native looper handles EINTR. 
Change-Id: I0a42db5f273b9bfe4ab174e4ee65d5d852f9f6bc
 2010-09-16 17:04:52 -07:00
Winson Chung
50ff0c46b1 Merge "Prevent multiple RemoteViewAdapters from being set for the same intent." 2010-09-16 17:02:19 -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
Gil Dobjanschi
8869534faf Merge "Initial Video Editor API" 2010-09-16 16:40:12 -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
Romain Guy
223d427de7 Merge "Snap layer bounds to pixel boundaries." 2010-09-16 14:43:11 -07:00
Romain Guy
4809af3d8a Merge "Better error handling in the OpenGL renderer." 2010-09-16 14:18:22 -07:00
Vasu Nori
01aa06e237 Merge "change error message on cl I392875b62ed270741633f5bffa519932e4a9f985" 2010-09-16 14:01:12 -07:00
Steve Howard
ffd2328824 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-09-16 13:56:25 -07:00
Steve Howard
11ad16f2af am 4cd34abe: am 47874718: Merge "Support new URI structure for download provider." into gingerbread 
Merge commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b'

* commit '4cd34abe538ea1da4aba8685ef6c8dc6c3e4947b':
  Support new URI structure for download provider.
 2010-09-16 13:56:06 -07:00
Joe Onorato
356d41cece Merge "Make javadoc warnings into errors." 2010-09-16 13:56:01 -07:00
Joe Onorato
0c8627fec3 Merge "Fix broken javadoc." 2010-09-16 13:55:45 -07:00
Joe Onorato
a2e949ab4b Merge "There is no @note javadoc tag." 2010-09-16 13:55:21 -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
87fab277fd am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread 
Merge commit '61cf67a220ba3205737c646c1c836a92074220de'

* commit '61cf67a220ba3205737c646c1c836a92074220de':
  Input API review.
 2010-09-16 13:05:50 -07:00