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

3926 Commits

Author SHA1 Message Date
Andreas Huber
8cdc31f76a Merge "Fix the build." 2011-02-10 12:35:06 -08:00
Andreas Huber
c2f9a26b1e Fix the build. 
Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
 2011-02-10 12:34:25 -08:00
Marco Nelissen
4fd18e6310 Merge "Better genre support." 2011-02-10 12:23:11 -08:00
Marco Nelissen
cb613a04c1 Better genre support. 
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
 2011-02-10 12:09:16 -08:00
Andreas Huber
8e6f60d9bb Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support" 2011-02-10 11:55:22 -08:00
Andreas Huber
b2934b16ea Change timestamp handling in RTSP, remove unused, experimental, gtalk support 
related-to-bug: 3216447

NTP timestamp handling is now done at a higher layer than before.

Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
 2011-02-10 11:53:54 -08:00
Santosh Madhava
adca6840e3 Merge "Fix for 3431967: Memory leak from video editor engine in JNI" 2011-02-10 09:41:27 -08:00
Santosh Madhava
91ba3a0033 Fix for 3431967: Memory leak from video editor engine in JNI 
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
 2011-02-09 19:25:17 -08:00
James Dong
f6a2bff0c9 Reduce blocking time in file write 
bug - 3418787

Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
 2011-02-09 15:44:32 -08:00
James Dong
10a5e2794d Catch read error from AudioRecord and do not assert 
bug - 3439313

Change-Id: Ie29d6e4945978ef27fc3e5849e467d895c7736d3
 2011-02-09 12:49:31 -08:00
Mike Lockwood
0a8bfd1b3b Merge "MTP: Fix NPE in MtpPropertyGroup" 2011-02-08 19:00:32 -08:00
Mike Lockwood
fd22edc668 MTP: Fix NPE in MtpPropertyGroup 
Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-08 21:45:22 -05:00
James Dong
cbefb805a8 Merge "Should reset errno to 0 before calling strtoll()." 2011-02-08 16:07:42 -08:00
James Dong
75fb238b3f Should reset errno to 0 before calling strtoll(). 
bug - 3431238

Change-Id: I855847209d2e022242b8eb62985759922ab94779
 2011-02-08 15:41:58 -08:00
Gloria Wang
9a7836d48f Merge "Add more check before using the DRM manager client." 2011-02-08 14:12:02 -08:00
Gloria Wang
adc4d9c86d Add more check before using the DRM manager client. 
Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
 2011-02-08 13:25:27 -08:00
Andreas Huber
5ed9a80571 Merge "Handle some edge cases when seeking while starting up OMXCodec" 2011-02-08 13:15:37 -08:00
Andreas Huber
b928983334 Handle some edge cases when seeking while starting up OMXCodec 
These were exposed by the new preview-seekframe while paused code.
In particular, the codec may have been in state RECONFIGURING when attempting
to seek, or we may have initiated flushing of the output port and this may not
have completed yet by the time we want to reconfigure the output port.

Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b
related-to-bug: 3392259
 2011-02-08 13:10:25 -08:00
Andreas Huber
2157f045d3 Merge "Remove one log message from the VPXDecoder" 2011-02-08 11:47:23 -08:00
Gloria Wang
4a4bf22116 Merge "- Do not use global DrmManagerClient - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811" 2011-02-08 11:16:27 -08:00
Andreas Huber
e0b3747861 Remove one log message from the VPXDecoder 
related-to-bug: 3402216

The VPX format supports "internal-only" frames that are
referenced by future content but never actually displayed, so
this is a perfectly valid scenario that doesn't require a
log message.

Change-Id: I8330bfdfefcdf4ab66ae6d2b59b99fd9b89350df
 2011-02-08 11:04:08 -08:00
Yu Shan Emily Lau
5d386a1ae2 Fix the build. 
Change-Id: Ie02c5086c1dc8c4ef1c52c6ae43b018a48a18bdd
 2011-02-07 21:18:00 -08:00
Yu Shan Emily Lau
9cca1da60c Merge "Remove the old media player stress test. Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which side-loaded to the device." 2011-02-07 20:16:17 -08:00
Yu Shan Emily Lau
a58389bdc1 Remove the old media player stress test. 
Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which
side-loaded to the device.

Change-Id: I41d54b5286da0aecb52a37feec176d8ae5456d9e
 2011-02-07 18:59:40 -08:00
Gloria Wang
c2dc4729e3 - Do not use global DrmManagerClient 
- Release the DrmManagerClient and DecryptHandle in DataSource
Fix for bug 3429811

Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
 2011-02-07 15:10:33 -08:00
Dharmaray Kundargi
3ec816ba61 am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb 
* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
  Fix issue 3426489 Overlay background changed when exported
 2011-02-07 13:50:31 -08:00
Dharmaray Kundargi
88928ffc1c am 73edcfe8: am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 
* commit '73edcfe8f4678c4d5e91c8018e00a72ea325da71':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
 2011-02-07 13:49:38 -08:00
Danny Fernandes
5bdbb562ee am 7d913d43: am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 
* commit '7d913d4350230afba8dea55718d887cf967d1ab2':
  Fixed 3423072 Imported 1080x720 video clips present distorted view
 2011-02-07 13:49:25 -08:00
Eric Laurent
b82d4570d9 am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb 
* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
  Issue 3395734: fix media server restart detection
 2011-02-07 13:49:16 -08:00
Eric Laurent
3da2538aa1 am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb 
* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
  Fix issues 3425035 and 3423785.
 2011-02-07 13:46:31 -08:00
Danny Fernandes
23dea9a139 am 1734e835: am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb 
* commit '1734e8350f1aadbebf8234e3c470a9d4d0c96e8f':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level
 2011-02-07 13:46:06 -08:00
Dheeraj Sharma
0b180a7fae am d5924e9d: am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame 
* commit 'd5924e9d3a370c2816613d4420b622b857da4f00':
  Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
 2011-02-07 13:43:02 -08:00
Dheeraj Sharma
4d3cd2c23e am 6a9cb7dd: am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb 
* commit '6a9cb7ddec346145b4563e06ff0940199758f888':
  Modification for using Software decoder for thumbnail generation in JNI
 2011-02-07 13:42:06 -08:00
Andreas Huber
c442bbe264 Merge "Display a single (still-)frame of video after seeking while paused." 2011-02-07 13:10:01 -08:00
Mike Lockwood
7da5fd29da Merge "MTP: Add support for querying all objects in GetObjectPropList" 2011-02-07 12:14:13 -08:00
Andreas Huber
0a84f4fef9 Display a single (still-)frame of video after seeking while paused. 
Change-Id: Ia78bf29ba6d649043e70c49913725cecdf918c03
related-to-bug: 3392259
 2011-02-07 11:43:12 -08:00
Gil Dobjanschi
9d967a5530 am 99ec3e7f: am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb 
* commit '99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c':
  Bug fix: 3421011 ANR during delete video clip
 2011-02-07 11:39:27 -08:00
Mike Lockwood
4356d81b34 MTP: Add support for querying all objects in GetObjectPropList 
Change-Id: I1f31971c4c777462f485e52fac016dc0fff48ad9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-07 13:58:08 -05:00
Dharmaray Kundargi
284f3128fa am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb 
* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
  Fix issue 3426489 Overlay background changed when exported
 2011-02-04 19:11:55 -08:00
Dharmaray Kundargi
ab280b8db6 Fix issue 3426489 Overlay background changed when exported 
Change-Id: I53d05732f6de6363cfb64fc84b2539e957adfcd6
 2011-02-04 18:23:20 -08:00
Dharmaray Kundargi
73edcfe8f4 am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 
* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
 2011-02-04 17:03:47 -08:00
Dharmaray Kundargi
b894f8959c Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 2011-02-04 17:01:51 -08:00
Danny Fernandes
7d913d4350 am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 
* commit '6ef407c0e6e3c178b01e2837e59348f72c97cf8c':
  Fixed 3423072 Imported 1080x720 video clips present distorted view
 2011-02-04 16:54:17 -08:00
Danny Fernandes
6ef407c0e6 Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 2011-02-04 16:52:10 -08:00
Eric Laurent
5f3e9e69a1 am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb 
* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection
 2011-02-04 16:33:43 -08:00
Eric Laurent
d4b88c8829 Merge "Issue 3395734: fix media server restart detection" into honeycomb 2011-02-04 16:30:03 -08:00
Eric Laurent
086396a924 Issue 3395734: fix media server restart detection 
Commit 25101b0b in AudioSystem for issue 3395734 broke the mechanism
in AudioService to poll and detect the restarting of media server
process after a crash.

The fix consists in changing the method used to poll AudioSystem and
trigger a callback indicating success when media server is responding
(the method must be on IAudioFlinger and not IAudioService to trigger the callback).

Change-Id: I843c0194de9cbf82c779cabbf2f3cbf8064603c8
 2011-02-04 16:22:57 -08:00
Danny Fernandes
69e868dcab Fixed 3423072 Imported 1080x720 video clips present distorted view 
Change-Id: If4f4039c516eb77423dd590e8634a2d4a05d4622
 2011-02-04 16:08:07 -08:00
Dharmaray Kundargi
0d99f5a95c Fix issue 3426200 Movie Studio crashes when a media item is deleted 
Change-Id: I1149fbfd22b44b388897bbcc6970da74c1f6ac4f
 2011-02-04 15:46:09 -08:00
Eric Laurent
bdb23c2675 am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb 
* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
  Fix issues 3425035 and 3423785.
 2011-02-04 14:08:25 -08:00