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

21650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
323b75e3c4 am c55f6da7: am 0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread 
Merge commit 'c55f6da7281d34a4b875975cdf68f5062dfe4b34'

* commit 'c55f6da7281d34a4b875975cdf68f5062dfe4b34':
  Revert "Revert "Free created FileMap when uncompressing files""
 2010-09-24 15:22:44 -07:00
Kenny Root
d6d93dbb86 am 3e07c000: am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread 
Merge commit '3e07c0007b10fbda945516acaf6b2a8787a6ca06'

* commit '3e07c0007b10fbda945516acaf6b2a8787a6ca06':
  Add locking around ZIP seeking
 2010-09-24 15:22:38 -07:00
Andreas Huber
68a63161cf am a1c7b096: am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread 
Merge commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34'

* commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34':
  Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
 2010-09-24 15:20:35 -07:00
Robert Greenwalt
0f95fe9b86 Merge "resolved conflicts for merge of 2d457a32 to master" 2010-09-24 14:48:25 -07:00
Robert Greenwalt
d4ab0a6d2e resolved conflicts for merge of 2d457a32 to master 
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
 2010-09-24 14:47:06 -07:00
Eric Fischer
c00012d295 Merge "Import revised translations." 2010-09-24 13:18:57 -07:00
Stephen Hines
25cf8a9621 Merge "Adding support for dynamically updated test status" 2010-09-24 12:10:31 -07:00
Kenny Root
718a7db758 am 0b606263: Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread 
Merge commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd' into gingerbread-plus-aosp

* commit '0b60626391ec840cc4a6d58ef77a2d029c2209dd':
  Revert "Revert "Free created FileMap when uncompressing files""
 2010-09-24 11:36:46 -07:00
Kenny Root
03944f2964 am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread 
Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp

* commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
  Add locking around ZIP seeking
 2010-09-24 11:36:42 -07:00
Kenny Root
aea0ae5ad4 Merge "Revert "Revert "Free created FileMap when uncompressing files""" into gingerbread 2010-09-24 11:33:35 -07:00
Kenny Root
7f3a7afc92 Merge "Add locking around ZIP seeking" into gingerbread 2010-09-24 11:33:29 -07:00
Eric Fischer
ff21c93540 am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'

* commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
  Import revised translations.  DO NOT MERGE
 2010-09-24 11:25:47 -07:00
Andreas Huber
3c35842046 am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread 
Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp

* commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6':
  Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
 2010-09-24 11:09:33 -07:00
Robert Greenwalt
3c6ca6dc2f am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread 
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
 2010-09-24 11:09:29 -07:00
Eric Fischer
ff2f5177e1 am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '4318ab058629b701e225bb7ead9dd2b229c9354b' into gingerbread-plus-aosp

* commit '4318ab058629b701e225bb7ead9dd2b229c9354b':
  Import revised translations.  DO NOT MERGE
 2010-09-24 11:05:07 -07:00
James Dong
7d20a39179 Merge "Added two more video encoders" 2010-09-24 10:56:19 -07:00
Mike Lockwood
68179fc3d7 Merge "Add constant for SDCARD_RW group ID." 2010-09-24 10:45:38 -07:00
Andreas Huber
d3eaa15246 Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread 2010-09-24 10:44:01 -07:00
Robert Greenwalt
ea871eb0b1 Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Eric Fischer
421f2d2566 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:37:04 -07:00
Eric Laurent
e5dbc01d7c am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbread 
Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e'

* commit '692dfafe02d04cdbab5367546e166580c92e4d2e':
  Fix issue 3007862
 2010-09-24 10:34:28 -07:00
Marco Nelissen
8409668914 Merge "Send album artist to the media provider again." 2010-09-24 10:27:36 -07:00
Eric Laurent
2a61620ae6 am 880dfe4f: Merge "Fix issue 3007862" into gingerbread 
Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp

* commit '880dfe4f675128188f8d598f2025a417ccabd1bf':
  Fix issue 3007862
 2010-09-24 09:49:07 -07:00
Eric Laurent
b21a6713b9 Merge "Fix issue 3007862" into gingerbread 2010-09-24 09:43:24 -07:00
Alex Sakhartchouk
29eac519b3 Merge "Adding support for all allowed textures. Cleaning up unused code Adding error messages" 2010-09-24 09:42:47 -07:00
Kenny Root
b47eafac1d Revert "Revert "Free created FileMap when uncompressing files"" 
This revert reverts commit a19ef306bd0a257c67b50f5e0e669e9fe52b0889.
 2010-09-24 09:11:28 -07:00
Andreas Huber
70cdedae35 am 19fe783d: am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread 
Merge commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839'

* commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839':
  Proper sync-frame detection for sources that don't already provide it.
 2010-09-24 08:38:04 -07:00
Andreas Huber
24e3e8fb1b am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread 
Merge commit '37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp

* commit '37155854b4d9ca405e5c41c4ab271006a4716193':
  Proper sync-frame detection for sources that don't already provide it.
 2010-09-24 08:27:33 -07:00
Andreas Huber
864ec8e074 Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread 2010-09-24 08:17:20 -07:00
Kenny Root
fa98920b71 Add locking around ZIP seeking 
Since we switched to seeking to the LFH to verify its existence instead
of a huge mmap of the file, we have to guarantee that another seek
doesn't happen before we finish our read on the LFH.

Change-Id: If8135d9cb6f2f5cc4db734eafa4f6b5f6269c62a
 2010-09-24 08:05:51 -07:00
Steve Block
01ac274f66 Merge "Remove superfluous Ahem.tff" 2010-09-24 03:32:14 -07:00
satok
89a3c79286 am abdbb5c1: am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread 
Merge commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d'

* commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d':
  Use MOTOYA font for Japanese font
 2010-09-24 01:41:50 -07:00
satok
4728e30b0a am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread 
Merge commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982' into gingerbread-plus-aosp

* commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982':
  Use MOTOYA font for Japanese font
 2010-09-24 01:37:39 -07:00
satok
ffe49bf1a1 Merge "Use MOTOYA font for Japanese font" into gingerbread 2010-09-24 01:33:23 -07:00
Hung-ying Tyan
155e974db3 Merge "fix build" 2010-09-23 23:24:35 -07:00
Chia-chi Yeh
e2f89dda73 am 33460d83: am 658bec95: SDP: remove dead code. 
Merge commit '33460d836fc2a062290d72ebcfb73af51ffa9c36'

* commit '33460d836fc2a062290d72ebcfb73af51ffa9c36':
  SDP: remove dead code.
 2010-09-23 22:50:10 -07:00
Hung-ying Tyan
92b74798a8 resolved conflicts for merge of ee813bae to master 
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
 2010-09-24 13:45:43 +08:00
Mathias Agopian
30faafb7d3 am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 
Merge commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e'

* commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 21:41:30 -07:00
Steve Howard
99c37fe5dc am 56d60903: am a7bfe6ad: Support "seascape" rotation for "landscape-only" apps 
Merge commit '56d6090380027efc7910537a2c2b99097ca36778'

* commit '56d6090380027efc7910537a2c2b99097ca36778':
  Support "seascape" rotation for "landscape-only" apps
 2010-09-23 21:40:48 -07:00
Joe Onorato
dd493dd8f1 am 982c07e9: am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread 
Merge commit '982c07e908c4cb66db224ccfd0810bf8bd449835'

* commit '982c07e908c4cb66db224ccfd0810bf8bd449835':
  Crash apps when they provide bad notifications instead of crashing the system process.
 2010-09-23 21:40:24 -07:00
Chung-yih Wang
57363e918a am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread 
Merge commit '1e2df14a85f098d63b618531db733a21429d4037'

* commit '1e2df14a85f098d63b618531db733a21429d4037':
  Handle OPTIONS requests from SIP servers.
 2010-09-23 21:39:49 -07:00
Dianne Hackborn
872736e3ca Merge "resolved conflicts for merge of 8952a448 to master" 2010-09-23 21:28:38 -07:00
Dianne Hackborn
8f6bab0b8f resolved conflicts for merge of 8952a448 to master 
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
 2010-09-23 20:33:19 -07:00
Mike Lockwood
5e718cddda Merge changes Ie8bd9107,I1065179a 
* changes:
  MTP: Reenable GetObjectPropValue and SetObjectPropValue
  MTP: Minor debug output cleanup
 2010-09-23 20:09:46 -07:00
Chia-chi Yeh
29f9457878 am 658bec95: SDP: remove dead code. 
Merge commit '658bec956785e074edc4f6c9fe739c366e37be33' into gingerbread-plus-aosp

* commit '658bec956785e074edc4f6c9fe739c366e37be33':
  SDP: remove dead code.
 2010-09-23 19:22:12 -07:00
Mike Lockwood
e51464c004 Merge changes I75c4c7dc,Ie9f3dea3 
* changes:
  MTP: List all the formats we support in addition to FORMAT_UNDEFINED
  MTP: Fix problems with signed ints in MtpCursor.cpp
 2010-09-23 19:11:21 -07:00
Hung-ying Tyan
020b95d893 am 84a357bb: Refactoring SIP classes to get ready for API review. 
Merge commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c' into gingerbread-plus-aosp

* commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c':
  Refactoring SIP classes to get ready for API review.
 2010-09-23 19:10:49 -07:00
Mathias Agopian
9a15fabc2f Merge "dump HWC state in dumpsys" 2010-09-23 18:19:46 -07:00
Mathias Agopian
303f3eb352 am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 
Merge commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f' into gingerbread-plus-aosp

* commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 18:17:08 -07:00
Mathias Agopian
3bbafb57c3 Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 2010-09-23 18:14:44 -07:00