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

978 Commits

Author SHA1 Message Date
Mike Lockwood
8b4a4207f6 am bd3d019c: am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1 
* commit 'bd3d019cc66237c23ab0658ff80aa7923e84b239':
  MTP: Use SharedPreferences for MTP device properties rather than sqlite3
 2011-03-07 20:08:58 -08:00
Mike Lockwood
823f5bf3db Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1 2011-03-07 20:04:23 -08:00
Santosh Madhava
165c77b9e4 am 5893b453: am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1 
* commit '5893b453fc762d18e759a391a442600be4924489':
  Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
 2011-03-07 19:47:26 -08:00
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
Mike Lockwood
2d5bb293a4 am 1cdb2929: am 11cb5cb9: Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1 
* commit '1cdb2929f368a1ab1c30e89200e585fcb1278492':
  MtpClient: Fix problem with getDeviceList() returning empty result in some cases
 2011-03-07 13:36:20 -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
Andreas Huber
c4c38fc1ea Added more metadata published by the MediaMetaDataRetriever 
- presence of audio/video content
- video dimensions
- avg. bitrate

Change-Id: Ie6d478a3c2d0bb6bebaea99ac0a20a4c17808934
related-to-bug: 3506316
 2011-03-04 10:32:36 -08:00
Ray Chen
a2c322f599 3406494 Gallery photos in nonsensical order 
Change-Id: Ic992465a6683179bff280753dcaf9aa6372424e6
 2011-03-03 15:04:57 +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
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
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
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
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
Rajneesh Chowdury
f67441eb37 Instrumentation code to enable/disable memory leak check using setprop 
The heap memory dump is enabled when libc.debug.malloc property is 1.
Two .dump files are created in predefined path.

Memory leak report can be generated using nativeheapdump tool.

Change-Id: Ie03928b5a05993e72d4700a158657c514478ecd3
 2011-02-27 20:59:12 -08:00
Santosh Madhava
bcbf68583e Fix for issue 3466385: Low quality video properties are applied to all 
Change-Id: Idcae85d88de65bae549263f9c43a6f3020dd63a1
 2011-02-27 17:37:23 -08:00
Santosh Madhava
89782f5013 Fix for issue 3485010: The project thumbnail is not regenerated 
Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
 2011-02-24 15:12:11 -08:00
Mike Lockwood
b607b884bd Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts" 2011-02-24 14:05:02 -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
Mike Lockwood
188d00b07e UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts 
These extras are also accessable via the UsbDevice and UsbAccessory classes,
which are also included as extras.
Since you can't filter Intents based on extras there is no point in duplicating
this information as separate extras.

Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-23 13:14:33 -08:00
Santosh Madhava
bba9529d79 Merge "Cleanup for issue 3471160 : video editor calls System.gc" 2011-02-23 09:59:07 -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
James Dong
9a146d9d65 am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb 
* commit 'd97c598ff4d902583f9083960b088b31350d0018':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
 2011-02-22 21:41:25 -08:00
James Dong
d97c598ff4 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb 
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
 2011-02-22 21:15:19 -08:00
Santosh Madhava
3f48207ea4 Cleanup for issue 3471160 : video editor calls System.gc 
Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
 2011-02-22 20:19:38 -08:00
Mike Lockwood
16dc3073a2 Don't treat WMV and ASF files as video files unless WMV is supported 
Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-22 17:49:00 -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
James Dong
14460b9564 Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed 
bug - 3040402

Change-Id: I455d2a664851c73212711e8c4b88e97b50ee5b62
 2011-02-22 13:45:57 -08:00
Rajneesh Chowdury
dab9689491 Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash" 2011-02-22 10:50:21 -08:00
Rajneesh Chowdury
06a087a52b Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash 
Change-Id: Ib257484ff8646b8e6a0a6a4bb9b937d5338c060c
 2011-02-21 17:46:41 -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
699587da4b VideoEditor:Inconsistance defines:Issue ID:3419090 
Assigned with MediaProperties array values

Change-Id: I97efa98954eb1be3b21a9e42b989def6bb657d77
 2011-02-14 17:50:32 -08:00
Basavapatna Dattaguru
b27a1ca53e Merge "VideoEditor: Fixes Issue ID:3448077" 2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
4eb7a98342 VideoEditor: Fixes Issue ID:3448077 
Updated with review comments. checks width & height

Change-Id: I79bd28862f511e7653e7e7a63c88772834ee6559
 2011-02-11 18:03:01 -08:00
Basavapatna Dattaguru
2b06e56031 VideoEditor: Populate profile&level: Issue:3419090 
Updated with new values for Profiles and levels

Change-Id: Ib0abcab1be741c151ce44b54eb1deff64828af00
 2011-02-11 17:18:54 -08:00
Mike Lockwood
540380fb0a Add MTP/PTP host support to the public API 
Needed for unbundling the Gallery app

Change-Id: I57e6b76ee5c9e57cb8c055329ac13251879baafd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-11 09:09:11 -05:00
Glenn Kasten
8132a8caf3 Merge "Bug 3352047 Wrong message when adjusting volume" 2011-02-10 15:27:59 -08:00
Glenn Kasten
8b4b97a14a Bug 3352047 Wrong message when adjusting volume 
Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
 2011-02-10 14:37:42 -08:00
Eric Laurent
04f7861cfa Merge "Fix issue 3435692" 2011-02-10 14:01:27 -08:00
Eric Laurent
a25c5d88d1 Fix issue 3435692 
The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.

The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.

Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
 2011-02-10 13:24:04 -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
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
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
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