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

4199 Commits

Author SHA1 Message Date
Andreas Huber
93668dfdd6 Merge "Don't send the seek-complete notification twice." 2011-03-16 16:03:19 -07:00
James Dong
9fe05b7bc1 resolved conflicts for merge of 1cbf8493 to master 
Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
 2011-03-16 15:53:03 -07:00
Andreas Huber
f8a5b55740 Don't send the seek-complete notification twice. 
Change-Id: Ie994de2d57e20dde12b8d59af4968d03569c7efa
related-to-bug: 3489432
 2011-03-16 15:42:45 -07:00
James Dong
28fc2037bf am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
 2011-03-16 15:11:03 -07:00
James Dong
6ec0ca9e8e Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file. 
bug - 4109530

Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
 2011-03-16 14:11:32 -07:00
Andreas Huber
7532ae7f79 am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:18:42 -07:00
Andreas Huber
5bd3bb46b1 DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting. 
Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
 2011-03-16 12:04:56 -07:00
Andreas Huber
498422f4a2 Fix a race condition when playing an audio-only stream and seeking before starting. 
Change-Id: Id3883293caf316ce492f5eb16428c15ced82da38
related-to-bug: 4039068
 2011-03-16 10:50:18 -07:00
James Dong
005de48cfb Fix an issue where the timestamp provided by WAVExtractor does not start with 0 
Change-Id: Ie8eb86e26f026c07a3c3be43e35027b19de4a2c3
 2011-03-15 09:45:22 -07:00
James Dong
ed73246b32 Add memory leak tracking/debugging code to drm server 
bug - 4099038

Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
 2011-03-14 18:48:19 -07:00
James Dong
0660c7d048 Merge "Add a release() method to MediaScanner" 2011-03-14 17:49:25 -07:00
Shailendra Yadav
6c256d125e am e987cbaf: am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1 
* commit 'e987cbafc2a6c19cae1ccf50658fb6320bda084a':
  Fix for Don't allow adding 64-bit files(4086708)
 2011-03-14 17:41:53 -07:00
Shailendra Yadav
e987cbafc2 am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1 
* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
  Fix for Don't allow adding 64-bit files(4086708)
 2011-03-14 17:36:56 -07:00
Shailendra Yadav
3fabad87f6 Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1 2011-03-14 17:23:05 -07:00
Iliyan Malchev
60fdca229f Merge "frameworks/base: remove LOCAL_PRELINK_MODULE" 2011-03-14 16:58:05 -07:00
Shailendra Yadav
4d0ec22aa9 Fix for Don't allow adding 64-bit files(4086708) 
Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
 2011-03-14 15:07:05 -07:00
James Dong
f20dcbcba9 Merge "libstagefright: Add error handling in AMRNB deooder" 2011-03-14 14:43:24 -07:00
Iliyan Malchev
3070af0882 frameworks/base: remove LOCAL_PRELINK_MODULE 
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-03-14 14:25:59 -07:00
Sidipotu Ashok
14e974af73 libstagefright: Add error handling in AMRNB deooder 
Return error when AMRNB software decoder fails

Change-Id: I1203db4a4b5ac766c8c131d3d0ba18a4ff2e3ceb
 2011-03-14 12:48:52 -07:00
Eric Laurent
eb30077ee9 am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '733cb79a27fa434a1f5548201c953131285b4e81':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 12:06:54 -07:00
Mike Lockwood
8ecd9dc04d am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '2d24213fca55fece8ce4a69a53abcd45983b0443':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 12:04:27 -07:00
Kenny Root
76d41f5796 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 11:49:56 -07:00
James Dong
96a4323a47 Merge "Fix PV AAC decoder crash due to out-of-boundary array access." 2011-03-14 11:46:55 -07:00
Eric Laurent
733cb79a27 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 
* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
  Partial fix for issue 3515250: video chat and SCO
 2011-03-14 11:23:56 -07:00
Eric Laurent
3cbfd10bbb Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 2011-03-14 11:21:50 -07:00
James Dong
a2e29968ab Fix PV AAC decoder crash due to out-of-boundary array access. 
Two cases were fixed:
o xover had a larger number of bands than the high frequency band, which led to some negative array index under some circumstances
o integrated a PV fix from OpenCore.git where the array index for scratch_mem may be over the array boundary

bug - 3473128

Change-Id: I844cd8797b4e5b0120fafa0c46a8c1facea78a8b
 2011-03-14 10:13:03 -07:00
Mike Lockwood
2d24213fca am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 
* commit '3ec9d06f070db3a8899ad235736abd0ffaf6f578':
  MtpDevice: Handle zero length packets in readResponse()
 2011-03-14 09:44:15 -07:00
Mike Lockwood
90f5d75cf0 MtpDevice: Handle zero length packets in readResponse() 
Bug: 3509060

Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-14 10:33:22 -04:00
Mike Lockwood
92405699cb am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 
* commit '0bea34fc3ec5dfd8d0e7483368875b457b7e2262':
  MTP host: Fix problems reading large data packets
 2011-03-14 07:10:03 -07:00
Mike Lockwood
0bea34fc3e am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 
* commit 'dec0b755fff1bf87aafd397ef0dd864f54c587cf':
  MTP host: Fix problems reading large data packets
 2011-03-14 06:55:21 -07:00
Eric Laurent
fa640154f1 Partial fix for issue 3515250: video chat and SCO 
Do not call directly into AudioSystem in setBluetoothScoOn() but
send a message to the AudioService handler instead. As the
procedure to switch audio path to BT SCO can last some time we should
not block the caller which can run in the UI thread.

Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
 2011-03-12 15:59:51 -08:00
Mike Lockwood
bcc0516bc8 MTP host: Fix problems reading large data packets 
Fixes problem reading large thumbnails via PTP

Bug: 4065217

Change-Id: I643672512829c93ab0827091f39103dbb1918071
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-12 14:03:23 -05:00
Mike Lockwood
e1976e5c61 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '3b473d958c46ea6511b9599f727b47636e5cbc4a':
  USB: minor cleanup work
 2011-03-11 23:10:41 -08:00
James Dong
133cf8b92a Add a release() method to MediaScanner 
bug - 2586042

Change-Id: I08713ac75cbcaf01dff21a24cdefb6e2dacc92cb
 2011-03-11 19:08:59 -08:00
James Dong
a7727dc887 Merge "If MP3 decoder output frame size were 0, media server would crash." 2011-03-11 17:55:52 -08:00
Mike Lockwood
3b473d958c am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 
* commit '9fffd9a8bb73e9b225878686862d49b27e98c659':
  USB: minor cleanup work
 2011-03-11 17:54:23 -08:00
Ying Wang
86ad55028b Merge "Remove unnecessary ld flags." 2011-03-11 16:52:59 -08:00
James Dong
69ad25e0ff If MP3 decoder output frame size were 0, media server would crash. 
This is to log an error message should that happen.

Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
 2011-03-11 16:13:15 -08:00
Ying Wang
eab30df281 Remove unnecessary ld flags. 
This fixes the x86 buid, in which bfd linker is unavailabe.

Change-Id: Ibce1b5cbfb0435644b2d75056003578371510929
 2011-03-11 16:06:02 -08:00
Mike Lockwood
62cfeeb821 USB: minor cleanup work 
Bug: 4067029

Change-Id: Icd8f912ab8732b5f770a217b9b3731092597ce02
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-11 18:51:29 -05:00
Kenny Root
206c62ed34 am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-11 15:45:34 -08:00
James Dong
d96d1be7bd Merge "A little cleanup in MediaScanner JNI code" 2011-03-11 15:15:40 -08:00
James Dong
7d93b7574f am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread 
* commit '68f66b945e7a69549689becd2e656d9056f1e7f5':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE
 2011-03-11 14:31:37 -08:00
Chih-Wei Huang
4c1ac4e665 Remove unnecessary SkImageDecoder_libjpeg.cpp 
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: Ia0ed72d8a6cbd3b2f3997b71dfdcf72fee50f5bb
 2011-03-11 14:02:39 -08:00
James Dong
f399752858 A little cleanup in MediaScanner JNI code 
o mainly use the defined class name rather than repeat the string each time
  to reduce the typo chance.
o format the code also

Change-Id: I131c98f11335ff524d01a6791baa1b8c11013abc
 2011-03-11 13:36:28 -08:00
Mike Lockwood
b46ecb3526 am 75c95e9a: am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '75c95e9a6d5a91b660af62f72b5a3bac0f5c3811':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:53:13 -08:00
Mike Lockwood
75c95e9a6d am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 11:37:14 -08:00
James Dong
070b2e1a5c MP3Extractor and MP3 decoder fixes - DO NOT MERGE 
cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
    from what have been read to avoid reading the same remaining bytes in
    the buffer again.
o Speed up MP3Extractor using cached reads

bug - 4083532

Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
 2011-03-11 11:02:17 -08:00
Mike Lockwood
0eb7b697b7 Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1 
* changes:
  UsbManager: Hide APIs not needed for USB host or accessory support.
  Remove MtpClient class from framework and public API
  UsbDevice: Move IO related methods to new UsbDeviceConnection class
 2011-03-11 10:57:06 -08:00
Andreas Huber
92b94c7f97 Only use ChromiumHTTPDataSource if webkit was built with chromium support. 
Change-Id: I9ce16f4aae35c61c9fb92fefc2a7c72537631cba
 2011-03-11 10:07:19 -08:00