drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,520 Commits 1 Branch 0 Tags
Commit Graph

25520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Dodd
2f02044944 am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp

* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
  Support getting codec, width, and height in URL for gtalk playback.
 2010-08-12 16:47:52 -07:00
Mike Dodd
5f96138ba6 Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 2010-08-12 16:45:19 -07:00
Andreas Huber
73af0a9211 am 72ac1f26: Fix software avc encoder crash at EOS. 
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp

* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
  Fix software avc encoder crash at EOS.
 2010-08-12 16:18:19 -07:00
Andreas Huber
72ac1f26d7 Fix software avc encoder crash at EOS. 
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
 2010-08-12 16:14:29 -07:00
Mike Dodd
8741dfacf2 Support getting codec, width, and height in URL for gtalk playback. 
Format is rtsp://gtalk/codec/width/height

For example:
  rtsp://gtalk/H263-1998/320/200

Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
 2010-08-12 16:04:35 -07:00
Mathias Agopian
1f432b1920 am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 
Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp

* commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732':
  Fix a couple issues with the new hwcomposer HAL
 2010-08-12 15:09:30 -07:00
Mathias Agopian
b7d1be01ae Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 2010-08-12 15:07:29 -07:00
Mathias Agopian
f8e705dea4 Fix a couple issues with the new hwcomposer HAL 
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list

Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
 2010-08-12 15:03:26 -07:00
Trevor Johns
1ef758b817 am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60' into gingerbread-plus-aosp

* commit '404bffbeabbfa8c3f95cd92856d015a4d36e8a60':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:33:33 -07:00
Trevor Johns
404bffbeab am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread

* commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:30:11 -07:00
Trevor Johns
4f3c5372a5 Merge "Fix subscribe links for Developer Forums doc." into froyo 2010-08-12 14:27:33 -07:00
Wu-cheng Li
77a473fbce am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp

* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
  Improve camera documentation.
 2010-08-12 14:05:56 -07:00
Wu-cheng Li
ccaa002848 Merge "Improve camera documentation." into gingerbread 2010-08-12 14:04:07 -07:00
Wu-cheng Li
699fe93979 Improve camera documentation. 
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
 2010-08-12 14:00:14 -07:00
James Dong
b408f5490b am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes 
Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp

* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
  Add lost preview surface detection in the JNI layer
 2010-08-12 13:16:56 -07:00
Andreas Huber
3bf8c3427f am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread 
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp

* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
  Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
 2010-08-12 13:14:37 -07:00
Andreas Huber
53895c6a0e am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread 
Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp

* commit '66aa0f3d950f7f842327b47592baa920e855925c':
  APacketSource is too verbose.
 2010-08-12 13:14:33 -07:00
James Dong
8473db0254 am 708ec39c: Don\'t send late frames to software encoders for encoding 
Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp

* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
  Don't send late frames to software encoders for encoding
 2010-08-12 13:14:19 -07:00
James Dong
d790c6485a Add lost preview surface detection in the JNI layer 
Throws an IOException if this happens rather than crashes

Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
 2010-08-12 11:59:56 -07:00
Andreas Huber
ae3a1f4595 Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread 2010-08-12 11:02:17 -07:00
Andreas Huber
66aa0f3d95 Merge "APacketSource is too verbose." into gingerbread 2010-08-12 11:02:06 -07:00
Andreas Huber
00237b79a0 Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied. 
Change-Id: I7cc468a3095537347d86803579001458b62fcadb
 2010-08-12 10:58:24 -07:00
James Dong
708ec39c21 Don't send late frames to software encoders for encoding 
o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
 2010-08-12 10:40:58 -07:00
John Huang
edfe20c4bd am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:26:58 -07:00
James Dong
8aa244eab7 am 45cb3cfa: Merge "Handle large audio lost" into gingerbread 
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp

* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
  Handle large audio lost
 2010-08-12 10:12:28 -07:00
James Dong
f4e26da1af am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp

* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
 2010-08-12 10:12:21 -07:00
James Dong
45cb3cfacf Merge "Handle large audio lost" into gingerbread 2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8 Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 2010-08-12 10:07:38 -07:00
John Huang
c636b84616 Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 2010-08-12 10:07:06 -07:00
James Dong
0386d04b19 am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread 
Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp

* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
  Fix all fd leaks in authoring engine
 2010-08-12 09:22:17 -07:00
James Dong
581581fe1a Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Andreas Huber
3f55576e04 APacketSource is too verbose. 
Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
 2010-08-12 09:07:20 -07:00
Dianne Hackborn
9185e26a8f am fb86ce93: Add watermark support. 
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp

* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
  Add watermark support.
 2010-08-11 22:04:27 -07:00
Dianne Hackborn
fb86ce9307 Add watermark support. 
Use these system properties:

ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color

If ro.watermark.text is not set, no watermark will be shown.  All others
have reasonable defaults if they are not set.

Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
 2010-08-11 18:15:29 -07:00
Mathias Agopian
70a7c92e16 am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread 
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp

* commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee':
  should fix sim build, hopefully
 2010-08-11 17:35:58 -07:00
Mathias Agopian
65f2490e1b Merge "should fix sim build, hopefully" into gingerbread 2010-08-11 17:32:25 -07:00
Mathias Agopian
b59beb5ca6 should fix sim build, hopefully 
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
 2010-08-11 17:31:33 -07:00
Jeff Brown
4e14159a04 am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 
Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp

* commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb':
  Fix ViewRoot bug attempting to finish synthetic KeyEvents.
 2010-08-11 17:26:16 -07:00
Jeff Brown
bb65ae020f Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 2010-08-11 17:22:17 -07:00
James Dong
c6280bce51 Fix all fd leaks in authoring engine 
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
 2010-08-11 17:18:30 -07:00
Mathias Agopian
5744cd6ac8 am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread 
Merge commit '90dc48b17f673b7e334e3254ea633450f994226c' into gingerbread-plus-aosp

* commit '90dc48b17f673b7e334e3254ea633450f994226c':
  call into hwcomposer HAL when present
 2010-08-11 16:28:21 -07:00
Mathias Agopian
308e69896c am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread 
Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp

* commit '24d7050ca605804efd5fde03f0d0d8d1d052c247':
  don't handle the transparent region of a layer in draw()
 2010-08-11 16:26:05 -07:00
Mathias Agopian
f7db3e21ef am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread 
Merge commit '8e7515d9c938f5addd08d97bccfccfa976e76c11' into gingerbread-plus-aosp

* commit '8e7515d9c938f5addd08d97bccfccfa976e76c11':
  get rid of our LayerVector implementation
 2010-08-11 16:25:59 -07:00
Mathias Agopian
90dc48b17f Merge "call into hwcomposer HAL when present" into gingerbread 2010-08-11 16:24:46 -07:00
Mathias Agopian
801d0b33e8 am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread 
Merge commit '025822a03a09337ec382e708c5a798fe805109ed' into gingerbread-plus-aosp

* commit '025822a03a09337ec382e708c5a798fe805109ed':
  keep a list of visible sorted surfaces
 2010-08-11 16:23:06 -07:00
Mathias Agopian
24d7050ca6 Merge "don't handle the transparent region of a layer in draw()" into gingerbread 2010-08-11 16:21:01 -07:00
Mathias Agopian
8e7515d9c9 Merge "get rid of our LayerVector implementation" into gingerbread 2010-08-11 16:20:38 -07:00
Mathias Agopian
025822a03a Merge "keep a list of visible sorted surfaces" into gingerbread 2010-08-11 16:19:16 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread 
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
 2010-08-11 16:18:36 -07:00
Jeff Brown
92ff1dd835 Fix ViewRoot bug attempting to finish synthetic KeyEvents. 
Bug: 2834068
Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
 2010-08-11 16:18:13 -07:00