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

4250 Commits

Author SHA1 Message Date
Santosh Madhava
0e8dc72db3 Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1 2011-03-07 19:42:16 -08:00
James Dong
b1be086e1d am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch... 
* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
  Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
 2011-03-07 15:10:26 -08:00
James Dong
d581c04722 Add missing copyright headers for a couple of files. DO NOT MERGE 
Cherry-picked from other branch...

bug - 4025673

Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
 2011-03-07 14:50:40 -08:00
James Dong
4ed072f904 Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1 2011-03-07 14:41:50 -08:00
James Dong
e2693e5d62 Add missing copyright headers to a couple of files 
bug - 4025673

Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
 2011-03-07 14:34:05 -08:00
Mike Lockwood
2b8a1ee057 MtpClient: Fix problem with getDeviceList() returning empty result in some cases 
BUG: 3503128

Change-Id: I2263437d6018848e316ae4096eb07305fc4dc486
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-07 14:19:06 -05:00
Mike Lockwood
775de951a8 MTP: Use SharedPreferences for MTP device properties rather than sqlite3 
sqlite3 is overkill for what we are doing here, and more fragile.

BUG: 3512856

Change-Id: I83d86127949d894a3887db3456d91b013060e852
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-05 17:34:11 -05:00
Santosh Madhava
895a28e14e Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents 
Change-Id: I376483c42b5bed8d2a1765804c2261c18d720a0c
 2011-03-04 18:37:51 -08:00
James Dong
99b862476d Fix a leak from AACEncoder.cpp 
bug - 3470617

Change-Id: I328e92bc1b2aca72e5856703dae00f957f40bc27
 2011-03-04 16:30:37 -08:00
James Dong
858b673a35 Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode 
For some mp3 files, the mode can be changed from one audio frame to another. Without
the capability to switch modes, the decoded audio may have lots of artifacts.

bug - 3253310

Change-Id: Id57bb1f204642d15e38a800c72214f6794cfaa37
 2011-03-04 11:28:50 -08:00
Ray Chen
a2c322f599 3406494 Gallery photos in nonsensical order 
Change-Id: Ic992465a6683179bff280753dcaf9aa6372424e6
 2011-03-03 15:04:57 +08:00
Gloria Wang
396f6de660 Merge "- To track the usage of all audio output devices - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()" 2011-03-02 19:51:04 -08:00
Mike Lockwood
37b05d7d61 Merge "MtpClient: remove finalize override to avoid multiple calls to unregisterReceiver" 2011-03-02 17:14:57 -08:00
Mike Lockwood
1bdeef34ef MtpClient: remove finalize override to avoid multiple calls to unregisterReceiver 
BUG: 3497801

Change-Id: I4ed0166efcc509a18361287c5816bc4844089025
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-02 16:59:53 -08:00
Gloria Wang
9b3f1521b5 - To track the usage of all audio output devices 
- To track the currently used audio device
- The devices are separated as speaker and other audio devices
- Provide the collected data to battery application through pullBatteryData()

Change-Id: I374c755266b5ac6b1c6c630400f4daf901ea8acc
 2011-03-02 16:53:24 -08:00
Jamie Gennis
28a8cb75e8 Merge "Stagefright: Use the ANW min undequeued bufs query." 2011-03-02 16:44:51 -08:00
Andreas Huber
ce80b0ca33 Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size." 2011-03-02 16:22:20 -08:00
Andreas Huber
56e84ba150 Resize internal PES buffers dynamically instead of relying on a fixed maximum size. 
Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
 2011-03-02 16:18:33 -08:00
Andreas Huber
00fa3a729c Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity." 2011-03-02 16:11:01 -08:00
Andreas Huber
669ad13de9 Allow optional specification of a PTS timestamp when signalling a discontinuity. 
If present, rendering will be suppressed until reaching the timestamp.

Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19
related-to-bug: 3489454
 2011-03-02 15:38:32 -08:00
James Dong
d08f27ee5b Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits" 2011-03-02 14:00:56 -08:00
James Dong
c096a1308e PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits 
bug - 3464899

Change-Id: Idef81a1bd3846d60fc5e4a40c11ce1ba78ebaa23
 2011-03-02 12:26:14 -08:00
Andreas Huber
76bb1200c2 Merge "Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source." 2011-03-02 11:54:48 -08:00
Basavapatna Dattaguru
4a3a05879e Merge "Fix for issue 3371667: fix source code compilation warnings (4)" 2011-03-02 11:50:17 -08:00
Andreas Huber
c655790d61 Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source. 
Change-Id: Ib823c2dd28e84f4c49e3676f4e4962a6e006b166
related-to-bug: 3107013
 2011-03-02 11:14:44 -08:00
Basavapatna Dattaguru
4fad6762c6 Fix for issue 3371667: fix source code compilation warnings (4) 
Change-Id: I898f81fea6c061b9ca7cbd675218d9f4b8c0bc77
 2011-03-02 10:37:58 -08:00
Santosh Madhava
06b3afe2bd Merge "Fix for issue 3495914: (In Java) Video clip switches between start and end" 2011-03-02 09:48:39 -08:00
Santosh Madhava
7256a7c525 Fix for issue 3495914: (In Java) Video clip switches between start and end 
Change-Id: Ie5ea83c61c6c008162abea76e15d745a901a1e23
 2011-03-01 21:36:31 -08:00
James Dong
de1d7b4be6 Merge "Get rid of redundant media profiles" 2011-03-01 17:11:26 -08:00
James Dong
797e4f1dce Get rid of redundant media profiles 
bug - 3330679

Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
 2011-03-01 15:58:59 -08:00
Eric Laurent
9b44c662d5 Fix issue 3499926. 
Make sure that NumberEffectsEnabled is decremented at the same time as
SamplesToExitCountBb reaches 0 in Effect_process(). Not doing so
causes NumberEffectsEnabled not being decremented if Effect_setEnabled()
is called after SamplesToExitCountBb reaches 0 and before next Effect_process() is called.

Change-Id: Id827a301f93a5a09ecd9995a0c7d731ef526711a
 2011-03-01 12:35:18 -08:00
Santosh Madhava
2380aa08c2 Merge "Fix for issue 3431967: Memory leak from video editor engine" 2011-03-01 12:04:12 -08:00
Mike Lockwood
04e1a9620f Merge "Move USB framework support from android.hardware to android.hardware.usb package" 2011-03-01 11:58:22 -08:00
Santosh Madhava
71771b3b1b Fix for issue 3431967: Memory leak from video editor engine 
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
 2011-03-01 11:44:50 -08:00
Jamie Gennis
7fc013753b Merge "Stagefright: Query buffer usage from the component." 2011-03-01 11:41:29 -08:00
Jamie Gennis
29f87f76bc Merge "Add an OMX IL API for querying buffer usage flags." 2011-03-01 10:25:38 -08:00
Jamie Gennis
dbb520e0a0 Merge "Fix error recovery in Stagefright init." 2011-03-01 10:24:55 -08:00
Mike Lockwood
c4308f01c9 Move USB framework support from android.hardware to android.hardware.usb package 
Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-01 08:07:20 -08:00
Mike Lockwood
e8be6a8d5b Merge "CameraBrowser: Add USB device filter meta-data for digital cameras" 2011-02-28 17:46:04 -08:00
Mike Lockwood
0fd3c4a1e2 CameraBrowser: Add USB device filter meta-data for digital cameras 
This is used by the USB service to associate Gallery with PTP cameras.
Removed unnecessary broadcast receiver

Change-Id: Ifd78aa94f69cb7d6ec0b557313e90bb79812f15d
 2011-02-28 17:26:06 -08:00
Yu Shan Emily Lau
4fdc6ebb91 Merge "Remove the hard coded media recorder test cases. Add the native heap dump catpure functionality." 2011-02-28 14:10:23 -08:00
Jamie Gennis
01951fdbdc Stagefright: Use the ANW min undequeued bufs query. 
This change modifies Stagefright's ANativeWindow initialization to use
the new MIN_UNDEQUEUED_BUFFERS query on the ANativeWindow.

Change-Id: I62565945e90ac40de326de77adcfa5577ed89975
Related-Bug: 3356050
 2011-02-28 12:53:31 -08:00
Jamie Gennis
420246479b Fix error recovery in Stagefright init. 
This change fixes the error path of
OMXCodec::allocateOutputBuffersFromNativeWindow so that it cancels the
correct number of buffers if a dequeueBuffer operation fails.

Change-Id: Ib7cdcdf24f1718bc070ad218a5980949c0e942eb
 2011-02-28 12:23:23 -08:00
Jamie Gennis
94c59802c0 Stagefright: Query buffer usage from the component. 
This change makes Stagefright query the gralloc buffer usage flags from
the OMX IL component and passing those flags on to the ANativeWindow.

Change-Id: Ic9af8a9e6df9ff4aadc7355890324d68841bc488
Related-Bug: 3479027
 2011-02-28 12:12:58 -08:00
Jamie Gennis
e6befb88bd Add an OMX IL API for querying buffer usage flags. 
This change defines an OpenMAX IL API for querying from the IL component
the gralloc buffer usage flags that should be used to allocate the
buffers.  It also adds the Stagefright plumbing for using the new OMX IL
API.

Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6
Related-Bug: 3479027
 2011-02-28 12:12:20 -08:00
James Dong
8f77b413e8 Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4." 2011-02-28 11:27:09 -08:00
Santosh Madhava
9e69035598 Merge "Fix for issue 3466385: Low quality video properties are applied to all" 2011-02-28 11:06:55 -08:00
Eric Laurent
65260be5d4 Merge "Fix issue 3388354." 2011-02-28 09:53:04 -08:00
Rajneesh Chowdury
051d443071 Merge "Instrumentation code to enable/disable memory leak check using setprop" 2011-02-28 09:26:54 -08:00
Eric Laurent
854938a72d Fix issue 3388354. 
Release all sco audio clients when the intent indicating
STATE_AUDIO_DISCONNECTED state is received.
Also clear mScoClients array when clients are released.

Change-Id: I63ec9d70fe72a102e09a4a473a367fb2e550b171
 2011-02-28 09:13:00 -08:00