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

3605 Commits

Author SHA1 Message Date
Andreas Huber
559da2fd89 am 3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb 
* commit '3cd6302b9e54ff888df5eb47b35d25e7dac1d763':
  Prefill the cache before trying to instantiate the media extractor.
 2011-01-19 15:24:28 -08:00
Andreas Huber
3cd6302b9e Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb 2011-01-19 15:12:41 -08:00
Andreas Huber
9634665ed6 Prefill the cache before trying to instantiate the media extractor. 
The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.

Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30
related-to-bug: 3362836
 2011-01-19 15:07:19 -08:00
Gil Dobjanschi
fc8ea8ecb4 am c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition 
* commit 'c4edeb5a60a45af874474ae7244c921a268430f1':
  Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
 2011-01-19 14:13:41 -08:00
Gil Dobjanschi
c4edeb5a60 Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition 
Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
 2011-01-19 14:10:32 -08:00
Dharmaray Kundargi
97619db928 am fe93351c: Merge "remove eng developement local tags in make file" into honeycomb 
* commit 'fe93351cf1e16dcb32c3c824cf4f1201991b2130':
  remove eng developement local tags in make file
 2011-01-19 14:04:27 -08:00
Dharmaray Kundargi
fe93351cf1 Merge "remove eng developement local tags in make file" into honeycomb 2011-01-19 14:02:12 -08:00
James Dong
aa474aa6f9 am fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb 
* commit 'fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287':
  Logging the duration range from different media tracks for recording
 2011-01-19 13:59:02 -08:00
James Dong
fc37018a90 Merge "Logging the duration range from different media tracks for recording" into honeycomb 2011-01-19 13:57:06 -08:00
Dharmaray Kundargi
6dbd3ee67b remove eng developement local tags in make file 
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
 2011-01-19 12:14:46 -08:00
Andreas Huber
4026ea7c25 am 0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb 
* commit '0353459d405e20750b3ddd8abad83eace1ed2a39':
  Always revert to the previous bandwidth if the required sequence number cannot be found
 2011-01-19 11:59:14 -08:00
Andreas Huber
0353459d40 Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb 2011-01-19 11:56:15 -08:00
James Dong
da58076a6b Logging the duration range from different media tracks for recording 
Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
 2011-01-19 11:54:59 -08:00
James Dong
894339298e am 4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb 
* commit '4f28901f2a15f566a98bf5d14ac510e05401f960':
  Turn error/exception logging on at the native layer
 2011-01-19 11:52:56 -08:00
James Dong
581cad2221 Turn error/exception logging on at the native layer 
o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
 2011-01-19 11:42:53 -08:00
Andreas Huber
ee48eabab8 am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb 
* commit '71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
  Return a runtime error if decryption fails instead of asserting.
 2011-01-19 11:33:56 -08:00
Andreas Huber
283e031d11 Always revert to the previous bandwidth if the required sequence number cannot be found 
Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
 2011-01-19 11:30:43 -08:00
Andreas Huber
0cf2616fac Return a runtime error if decryption fails instead of asserting. 
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
 2011-01-19 11:24:39 -08:00
Andreas Huber
8da1ca5280 am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb 
* commit '069ee21a2012e0b6fd355253ea81a84ea11138d2':
  Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
 2011-01-19 10:40:19 -08:00
Andreas Huber
069ee21a20 Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb 2011-01-19 10:38:16 -08:00
Andreas Huber
d95b46a1d1 Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests. 
Refactor the logic a little.

Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
 2011-01-19 10:34:52 -08:00
James Dong
6df89f2efc am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb 
* commit '8e7d626385eef104d52aa9080b70395ca840a0cd':
  Expose average video frame rate via MPEG4Extractor
 2011-01-19 10:31:06 -08:00
James Dong
8e7d626385 Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb 2011-01-19 10:29:04 -08:00
Mike Lockwood
216a7b97eb am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb 
* commit 'dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
  MTP: Close and reopen driver file after an error.
 2011-01-19 10:23:44 -08:00
James Dong
cbb488d678 Expose average video frame rate via MPEG4Extractor 
bug - 3362483

Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
 2011-01-19 10:20:59 -08:00
Mike Lockwood
dc80b7ec05 Merge "MTP: Close and reopen driver file after an error." into honeycomb 2011-01-19 10:20:38 -08:00
Mike Lockwood
897f894e88 MTP: Close and reopen driver file after an error. 
BUG: 3368665

Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-19 10:11:28 -08:00
James Dong
1324e3b1a4 am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb 
* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
  Fix the presentation video resolution when it is different from the actual image resolution of the video.
 2011-01-19 10:06:23 -08:00
James Dong
4061c9aa6d Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb 2011-01-19 10:05:05 -08:00
Andreas Huber
d3bf3eeadd am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb 
* commit '2597aedb3869e46f945359c529e03263c77a944d':
  Turn another assertion into a runtime error. Damn you surfaces.
 2011-01-19 09:51:42 -08:00
Andreas Huber
ba1b16790a Turn another assertion into a runtime error. Damn you surfaces. 
Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab
related-to-bug: 3335220
 2011-01-19 09:20:58 -08:00
James Dong
08adfd29ae Fix the presentation video resolution when it is different from the actual image resolution of the video. 
bug - 3352413

Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
 2011-01-19 08:33:07 -08:00
James Dong
456570ef55 am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy 
* commit '5fb60c7af2cbf59a99ae324c4284c7860b37c723':
  Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
 2011-01-18 22:09:21 -08:00
James Dong
5fb60c7af2 Use metadata in video buffers for timelapse video recording by default to eliminate memcpy 
bug - 3361771

Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
 2011-01-18 21:33:58 -08:00
Mike Lockwood
6b280468f5 am 2bc6971d: Merge changes I7df1ff78,Ibc2e8adf into honeycomb 
* commit '2bc6971dd82d37273b0baafeeebf3ba90d15837f':
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
 2011-01-18 20:31:45 -08:00
Mike Lockwood
2bc6971dd8 Merge changes I7df1ff78,Ibc2e8adf into honeycomb 
* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
 2011-01-18 20:30:13 -08:00
Mike Lockwood
242d0cdc1a MediaScanner: Make sure name field is set for file based playlists 
Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 20:29:08 -08:00
Mike Lockwood
a1c9180461 MTP: Fix problem with MTP starting up on the first try. 
BUG: 3361230

Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 20:11:29 -08:00
Andreas Huber
f9846fcdf8 am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb 
* commit '39560507215774873ba64b5f0ff61648488924ea':
  Apparently our native TCP sockets do not return an error from blocking "connect"
 2011-01-18 15:37:58 -08:00
Andreas Huber
3956050721 Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb 2011-01-18 15:35:35 -08:00
Andreas Huber
eee580a495 Apparently our native TCP sockets do not return an error from blocking "connect" 
if the network interface is shutdown while connecting.

Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0
related-to-bug: 3362836
 2011-01-18 15:26:40 -08:00
James Dong
d2225a06a3 am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb 
* commit '1418de7eff012c37cf34328eb368a547d70a1441':
  Fix the sluggish preview during timelapse video recording because software encoder is used.
 2011-01-18 14:44:58 -08:00
James Dong
183fa14b47 Fix the sluggish preview during timelapse video recording because software encoder is used. 
bug - 3361771

Change-Id: Ic5344e9eabe7f1b82910b65b4260e4ad8dc51c32
 2011-01-18 14:28:37 -08:00
Eric Laurent
2d1362b7b4 am 74ff70d2: Merge "Fix typo" into honeycomb 
* commit '74ff70d2f2e90c591c58723121bc26ab44a3adcc':
  Fix typo
 2011-01-18 14:27:17 -08:00
Eric Laurent
74ff70d2f2 Merge "Fix typo" into honeycomb 2011-01-18 14:25:17 -08:00
Glenn Kasten
ed6eae420f Fix typo 
Change-Id: I73e7c5cf13c5ed82398006af61308665eb1d3ad0
 2011-01-18 14:13:28 -08:00
Mike Lockwood
14032e3b3e am 5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb 
* commit '5f31aa30cdf104dc10c2a503d7846178d6aa79cb':
  MTP: Set modification date for abstract playlists
 2011-01-18 13:32:12 -08:00
Mike Lockwood
5f31aa30cd Merge "MTP: Set modification date for abstract playlists" into honeycomb 2011-01-18 13:29:55 -08:00
James Dong
1b67fec7e1 am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb 
* commit '0a3dbf6f69a72d557afca69f006a407fbfc2482d':
  Fix the build break in git_master-without-vendor
 2011-01-18 13:28:47 -08:00
Mike Lockwood
8ed67acf38 MTP: Set modification date for abstract playlists 
BUG: 3224269

Change-Id: I96ae8e6d2f7e28860e9217ceb911331b333e1391
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 13:27:25 -08:00