4230 Commits

Author SHA1 Message Date
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
Glenn Kasten
6dd429efe2 am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
* commit '055066e1e77d944383360d50057f5b8187f23c0b':
  Bug 3012968 DRM output control
2011-03-11 08:46:40 -08:00
Glenn Kasten
055066e1e7 am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
  Bug 3012968 DRM output control
2011-03-11 08:44:35 -08:00
Mike Lockwood
c72eb9113a Remove MtpClient class from framework and public API
After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.

Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.

Bug: 4067029

Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 10:55:44 -05:00
Mike Lockwood
acc29cc91b UsbDevice: Move IO related methods to new UsbDeviceConnection class
UsbDevice is now just an immutable parcelable object like UsbInterface and
UsbEndpoint.
All IO related functionality is now contained in UsbDeviceConnection
and UsbRequest.

Bug: 4067029

Change-Id: Ia84da0b512a697acc940eee0c3566711c62e1a68
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 10:24:21 -05:00
Glenn Kasten
b8763f60b4 Bug 3012968 DRM output control
Modifies Stagefright to verify that there is a hardware-protected path
to video sink for DRM content.

Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
2011-03-10 19:16:40 -08:00
Gloria Wang
7363ac80cf Merge "Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead." 2011-03-10 16:37:21 -08:00
Gloria Wang
ae7752798a Fix for bug 3477330
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer.
Fix by using sp<DecryptHandle> instead.

Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
2011-03-10 16:20:48 -08:00
Rajneesh Chowdury
c0d9d25b87 am a4865ec7: am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
* commit 'a4865ec73f9faccd6dc442cbc6d78666b1a69b28':
  Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:14:27 -08:00
Rajneesh Chowdury
a4865ec73f am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
  Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:12:34 -08:00
Rajneesh Chowdury
a7118e33b4 Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 2011-03-10 15:10:39 -08:00
Rajneesh Chowdury
e7defc2975 Fix for 4080402 NPE in Transition.setDuration
Change-Id: I1e4499e3191beafdaf9bb4b7fd51798bd1eab300
2011-03-10 10:35:42 -08:00
Chih-Wei Huang
c2d68c9096 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: I3e7533126ef60fe2fd424fdc777760e73c93489b
2011-03-10 17:52:31 +08:00
Mike Lockwood
8fe7ca1d7d am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896':
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:53:43 -08:00
Mike Lockwood
18d8a0748d am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '564f12ebe409bead467eee04dfd719e97367e520':
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:50:31 -08:00
Mike Lockwood
564f12ebe4 Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* changes:
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:47:10 -08:00
Andreas Huber
aab7d1a29a Merge "Support http authentication ala http://foo:bar@host.org in stagefright." 2011-03-09 15:26:11 -08:00
Lorenzo Colitti
3b093c1339 am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit 'd1e09e08210e755034bbdd07e1f48b35ec9a4752':
  Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:21:34 -08:00
Lorenzo Colitti
6c3727413b am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.
* commit 'd6aaec0ce7639a9d8bb73983711e20545b55e860':
  Support IPv6 in HTTP streaming.
2011-03-09 15:21:31 -08:00
Lorenzo Colitti
d1e09e0821 am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit '8df2477c4e7e5bf72d6d1216ae5184c53304470e':
  Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:17:20 -08:00