ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity
19,283 Commits 2 Branches 0 Tags 54 MiB
b26b9cdf02
Commit Graph

19283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
b26b9cdf02 am 77a473fb: am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit '77a473fbcea0214832255af91e0a65d853757aae'

* commit '77a473fbcea0214832255af91e0a65d853757aae':
  Improve camera documentation.
 2010-08-12 14:07:59 -07:00
Wu-cheng Li
a3411d0c69 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
26105cad7c Merge "Improve camera documentation." into gingerbread 2010-08-12 14:04:07 -07:00
James Dong
28a2edde94 am b408f549: am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes 
Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf'

* commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf':
  Add lost preview surface detection in the JNI layer
 2010-08-12 13:30:57 -07:00
Andreas Huber
a0fb566d1b am 3bf8c342: 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 '3bf8c3427f4c728bb88e5e266b85c96e3e727203'

* commit '3bf8c3427f4c728bb88e5e266b85c96e3e727203':
  Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
 2010-08-12 13:28:39 -07:00
Andreas Huber
4a12fb35dc am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread 
Merge commit '53895c6a0e8ecb4e835aab7eca7480779c224356'

* commit '53895c6a0e8ecb4e835aab7eca7480779c224356':
  APacketSource is too verbose.
 2010-08-12 13:28:34 -07:00
James Dong
124bd61d2f am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for encoding 
Merge commit '8473db025423632d1145d895fe74af0e976efac4'

* commit '8473db025423632d1145d895fe74af0e976efac4':
  Don't send late frames to software encoders for encoding
 2010-08-12 13:28:23 -07:00
James Dong
4d441e8e52 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
631acd138f 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
e5ae84ecc1 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
4b34d03315 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
Jason Sams
99f1697629 Merge "Fix field packer bug for U32 data. Fix initial refcounts in allocations. Support null references in allocations." 2010-08-12 12:49:17 -07:00
Andreas Huber
240c79ec67 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
9f2c93d025 Merge "APacketSource is too verbose." into gingerbread 2010-08-12 11:02:06 -07:00
John Huang
e1dbabef5b am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
  Enhance WspTypeDecoder to decode Content Type Parameters
 2010-08-12 10:32:39 -07:00
John Huang
a8fd9374ed 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
7730855429 am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbread 
Merge commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff'

* commit '8aa244eab7ba834439cc919fd1f83d1e4ef49aff':
  Handle large audio lost
 2010-08-12 10:22:58 -07:00
James Dong
6ae743089f am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 
Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'

* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
 2010-08-12 10:22:48 -07:00
James Dong
53bcc7833b 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
5e866868e1 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
ca901d984d Merge "Handle large audio lost" into gingerbread 2010-08-12 10:07:51 -07:00
James Dong
ce49115a25 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
812a5686df Merge "Enhance WspTypeDecoder to decode Content Type Parameters" 2010-08-12 10:07:06 -07:00
James Dong
e5b37981cf am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread 
Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c'

* commit '0386d04b19619b03b6bce830010e11d31d3f8a5c':
  Fix all fd leaks in authoring engine
 2010-08-12 09:32:18 -07:00
James Dong
6ad3d3891d 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
28988defd2 Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Maksymilian Osowski
47aca3e1ab Merge "Added more info to the Summarizer." 2010-08-12 08:57:57 -07:00
Irfan Sheriff
df5f0d3677 Merge "Asynchronous API" 2010-08-12 07:58:46 -07:00
Shih-wei Liao
1bec861125 Merge "Fix anonymous struct." 2010-08-12 06:33:02 -07:00
Steve Block
5024310068 Merge "Update DeviceOrientationManager to be specific to a WebViewCore" 2010-08-12 06:30:31 -07:00
Daniel Sandler
f3bda2e870 Merge "System bar settings panel: first pass." 2010-08-12 04:58:40 -07:00
Dianne Hackborn
4ac3d56e78 Merge "Fix back popping the back stack too much." 2010-08-11 22:40:53 -07:00
Dianne Hackborn
2acf248049 am 9185e26a: am fb86ce93: Add watermark support. 
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e'

* commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e':
  Add watermark support.
 2010-08-11 22:10:07 -07:00
Dianne Hackborn
6c80c2b64b 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
Adam Powell
7bf432b8e4 Merge "Fix bug 2911311 and bug 2911700" 2010-08-11 21:59:54 -07:00
Romain Guy
436ce1e44d Merge "Bunch of fixes." 2010-08-11 19:38:40 -07:00
Adam Powell
622acae072 Merge "Fix bug 2911529" 2010-08-11 18:24:47 -07:00
Mathias Agopian
a0819fc7e4 am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread 
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'

* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
  should fix sim build, hopefully
 2010-08-11 18:07:42 -07:00
Jeff Brown
bd947ddd5e Merge "resolved conflicts for merge of 4e14159a to master" 2010-08-11 18:05:04 -07:00
Jeff Brown
a28db8319c resolved conflicts for merge of 4e14159a to master 
Change-Id: I42dc1efc2218af326a826aeb16daded71722b363
 2010-08-11 18:00:34 -07:00
Mathias Agopian
ea6dbaf302 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
ce6d43a32a Merge "should fix sim build, hopefully" into gingerbread 2010-08-11 17:32:25 -07:00
Mathias Agopian
f1352df47f should fix sim build, hopefully 
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
 2010-08-11 17:31:33 -07:00
Jeff Brown
c39f50a827 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
Adam Powell
d13428f2d3 Merge "ActionBar overlay mode, height fetching, show/hide" 2010-08-11 17:26:10 -07:00
Jeff Brown
f2a67c067d Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 2010-08-11 17:22:17 -07:00
Romain Guy
02b281160f Merge "Delete shaders after a compile error. Also disable extra logging." 2010-08-11 16:40:28 -07:00
Mathias Agopian
52271ad016 am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread 
Merge commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5'

* commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5':
  call into hwcomposer HAL when present
 2010-08-11 16:30:13 -07:00
Mathias Agopian
f44baa2e36 am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread 
Merge commit '308e69896c2812953d74ea63fe964bebaa68eef4'

* commit '308e69896c2812953d74ea63fe964bebaa68eef4':
  don't handle the transparent region of a layer in draw()
 2010-08-11 16:30:09 -07:00
Mathias Agopian
fdc848831b am f7db3e21: am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread 
Merge commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f'

* commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f':
  get rid of our LayerVector implementation
 2010-08-11 16:30:05 -07:00