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

267 Commits

Author SHA1 Message Date
Mike Lockwood
b239b68376 MTP and media provider support for multiple storage devices: 
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
 2011-04-05 15:19:16 -04:00
James Dong
a93f84e067 ISurfaceTexture does not have a method getIdentity() 
Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
 2011-04-01 13:29:27 -07:00
Mathias Agopian
696257ccf3 merge libsurfaceflinger_client into libgui 
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
 2011-03-25 18:42:40 -07:00
Eric Laurent
602b3286ff Fix issue 3509396: AudioEffect.getParameter JAVA. 
Removed dead/buggy code in AudioEffect.getParameter() and
AudioEffect.command() that was meant to return the actual length of
meaningful data in the returned parameter or command reply.

This is replaced by the method return status indicating this length when
positive (negative return codes still indicate the same errors as before).

Modified automated AudioEffect tests accordingly.

Change-Id: Ie89617f912766b8dee73b81f92af9c48027c982d
 2011-03-21 17:11:59 -07:00
Andreas Huber
5bb357f4cc Fixing the build. 
Change-Id: I89daa503029491e6f1a8321f7e45c9439315ad23
 2011-03-21 11:55:01 -07:00
Andreas Huber
14a80afa51 Merge "Support passing headers to MediaMetadataRetriever's setDataSource API" 2011-03-21 11:23:15 -07:00
Andreas Huber
5b7ced6a4e Support passing headers to MediaMetadataRetriever's setDataSource API 
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
 2011-03-21 11:13:59 -07:00
James Dong
9f2cde3cdb Scale the thumbnail if display dimension is different from the actual buffer size 
bug - 3379293

Change-Id: I31c08010c97387716433da99d648bd364847b6aa
 2011-03-20 14:46:30 -07:00
Rajneesh Chowdury
0b8fe2012d am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 
* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
 2011-03-16 16:10:32 -07:00
Rajneesh Chowdury
8e7991a52e Fix for 4087846 Crash reported by monkey report (Java/Jni) 
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
 2011-03-15 16:20:17 -07:00
James Dong
0660c7d048 Merge "Add a release() method to MediaScanner" 2011-03-14 17:49:25 -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
James Dong
133cf8b92a Add a release() method to MediaScanner 
bug - 2586042

Change-Id: I08713ac75cbcaf01dff21a24cdefb6e2dacc92cb
 2011-03-11 19:08:59 -08:00
Ying Wang
86ad55028b Merge "Remove unnecessary ld flags." 2011-03-11 16:52:59 -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
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
b966b9d9e8 MTP: Convert date created and modified values from seconds to milliseconds 
BUG: 4026365

Change-Id: Ifd78cca305299ed1cedd6595609d9bf8d520cd8e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-09 17:28:33 -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
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
71771b3b1b Fix for issue 3431967: Memory leak from video editor engine 
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
 2011-03-01 11:44:50 -08:00
Santosh Madhava
7c8f25f5b8 Fix for issue 3431967: Memory leak from video editor engine 
Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d
 2011-02-27 20:27:20 -08:00
Glenn Kasten
cc562a3576 Bug 3438258 Add SurfaceTexture as MediaPlayer sink 
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
 - New Java and C++ interfaces
 - C++ plumbing and implementation (JNI, Binder)
 - Stagefright AwesomePlayer and NuPlayer use ANativeWindow
   (either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
 2011-02-23 15:02:56 -08:00
Gloria Wang
87e639bc15 Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data" 2011-02-23 09:58:33 -08:00
Gloria Wang
d211f41f76 - Add method in MediaPlayerService to collect and pull 
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
 2011-02-22 22:42:05 -08:00
Mike Lockwood
66e57f6aa9 MTP: Disable MTP when the keyguard is locked and secure 
BUG:  3402847

Change-Id: I6c77efe18f525cd0af37911c8b6aac4f17352552
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-22 13:57:23 -08:00
Mike Lockwood
467ca0de6d MTP: Add support for dynamically adding and removing storage units 
BUG: 3402847

Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
 2011-02-22 13:57:23 -08:00
Santosh Madhava
df4723ef3c Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames 
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
 2011-02-16 22:32:02 -08:00
Basavapatna Dattaguru
9cfeb6ecfa VideoEditor:Issue ID: 3431967 
Fixes memory leak in getProperties
Updated with Review comments

Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
 2011-02-16 14:29:02 -08:00
Santosh Madhava
9ee9aad809 Fix for issue 3444358 : Movie studio is broken in Master-TOT 
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
 2011-02-11 11:34:26 -08:00
Dheeraj Sharma
1d830165a0 Merge "Fix for issue : 3439708 Last frame is missing effect" 2011-02-11 10:57:31 -08:00
Mike Lockwood
bc20c93863 Merge "MTP: Fix JNI warnings in MtpDevice" 2011-02-11 05:21:26 -08:00
Mike Lockwood
40304e2272 MTP: Fix JNI warnings in MtpDevice 
Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.

Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-11 08:19:11 -05:00
Dheeraj Sharma
fb4e92c4ed Fix for issue : 3439708 Last frame is missing effect 
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
 2011-02-10 18:05:20 -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
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
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
Danny Fernandes
6ef407c0e6 Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 2011-02-04 16:52:10 -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
Dheeraj Sharma
67ec9aa878 Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame 
Change-Id: Ie9cf769e42869b5cab57694e92884900d33f40d9
 2011-02-04 02:31:45 -08:00
Dheeraj Sharma
b62d78bd0d Modification for using Software decoder for thumbnail generation in JNI 
Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
 2011-02-03 23:20:07 -08:00
Dharmaray Kundargi
8930a1259d am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb 
* commit '2fa861cc6ef65696854dc4a85494bea6dd87fd8e':
  Fix issue 3408285 Crash while generating KenBurns
 2011-02-02 13:22:29 -08:00
Nemmara Venkateswaran
bf1e5cefe2 am e00d44ce: am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb 
* commit 'e00d44ced228dc523f4492edd66d4eeb5dabd305':
  Fix for issue 3370023 : Wrong aspect ratio in overlay
 2011-02-02 09:31:35 -08:00
Dharmaray Kundargi
beb9fc8ee8 Fix issue 3408285 Crash while generating KenBurns 
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
 2011-02-02 03:25:01 -08:00
Santosh Madhava
63298a9809 Fix for issue 3370023 : Wrong aspect ratio in overlay 
Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
 2011-02-02 01:38:45 -08:00
Dharmaray Kundargi
13c0552643 am e9c5ade3: am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes. 
* commit 'e9c5ade37168e43203c060635c66dbd4de2ae458':
  Fix issue 3414805 Crash during Overlay editing. JNI fixes.
 2011-02-01 20:44:33 -08:00
Dharmaray Kundargi
c08f85a648 Fix issue 3414805 Crash during Overlay editing. JNI fixes. 
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
 2011-02-01 20:19:16 -08:00
Dheeraj Sharma
3a70cf3aff am 60a3ead5: am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 
* commit '60a3ead52ec6216b28d1d82ab3480a08bf919c17':
  Fix for issue 3404671 Crash when exporting movie in JNI
 2011-01-30 18:18:43 -08:00
Dheeraj Sharma
cd73d1ed6d Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 2011-01-30 18:12:25 -08:00
Dharmaray Kundargi
8e6c69b092 am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
  Merging the same files on top of tree.
 2011-01-30 16:37:41 -08:00