698 Commits

Author SHA1 Message Date
Gil Dobjanschi
cd023f98fa Merge "Added a callback interface to the generatePreview method." 2010-12-02 13:39:06 -08:00
Gil Dobjanschi
786ecf849c Added a callback interface to the generatePreview method.
Change-Id: I7ba678aba47f232e1c320bb36decf59f80f3755d
2010-12-02 13:13:15 -08:00
Mike Lockwood
f45853af50 MediaScanner: Fix path mismatch in code that check for missing files in postScan()
BUG: 3213640

Change-Id: I102d6c9ae95adadb855e2199380117808ccaa1ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-02 10:35:49 -05:00
Mike Lockwood
7d7fb63071 MTP: Add support for multiple properties in GetObjectPropList command
Change-Id: Ib469a6c8141937aaa3e811345056195117abb4b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-02 08:16:12 -05:00
Eric Laurent
938f2577e6 am 371ed722: am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
* commit '371ed72216789505acadfac3f2e905dafb04f6e0':
  Update java doc for visualizer FFT capture.
2010-12-01 03:37:07 -08:00
Eric Laurent
371ed72216 am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
  Update java doc for visualizer FFT capture.
2010-11-30 11:56:00 -08:00
Eric Laurent
688f4c58d4 Merge "Update java doc for visualizer FFT capture." into gingerbread 2010-11-30 11:50:25 -08:00
Mike Lockwood
84e3916720 Merge "MTP: Don't fail in playlist transfer if not all playlist items can be found." 2010-11-30 09:22:00 -08:00
Mike Lockwood
7adfd1896c MTP: Don't fail in playlist transfer if not all playlist items can be found.
Change-Id: I8275c4e5eca34e193a3cedcba16442bf388e74eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-30 12:19:50 -05:00
Shyam Pallapothu
ca3c639cc4 Merge "Added new bitrate values" 2010-11-24 14:14:28 -08:00
Gil Dobjanschi
83cd9dcf98 Added new bitrate values
Change-Id: I2e6ab51d9a845beca02f84cefc66663fbf89aabf
2010-11-24 11:16:38 -08:00
Mike Lockwood
c0b8b321d5 Rename MtpClient and MtpCursor to PtpClient and PtpCursor
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Mike Lockwood
a31560598a Rename android.provider.Mtp to android.provider.Ptp
We are only supporting the PTP subset of MTP in host mode and have
no plans for full MTP, so calling it Mtp was misleading.

Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore
and added it to the public API.

Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Gil Dobjanschi
e45674e284 Merge "Begin transition was invalidated when the image duration was changed." 2010-11-22 16:38:38 -08:00
Gil Dobjanschi
37f7e0c7bf Begin transition was invalidated when the image duration was changed.
Change-Id: I0118813a66c65d8b3746fc2c689cf9d8da651aa3
2010-11-22 15:33:10 -08:00
Jean-Michel Trivi
8aa798b244 Unhide android.media.AudioManager.MODE_IN_COMMUNICATION
Unhide new constant for an audio mode for a system state when
 the device has a VoIP (as opposed to telephony) call established.
Update the setMode and getMode javadoc to link to the mode constants
 that can be set or retrieved.

Change-Id: I90c4417679f215eb66e5305086fd077beddaa59c
2010-11-22 13:30:34 -08:00
Mike Lockwood
954c267725 PTP: Improve performance and reliability of file importing
Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().

File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.

File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.

BUG: 2994234

Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 11:30:10 -05:00
Gil Dobjanschi
a0dfa2cdd8 AudioTrack getTimelineDuration clarification.
Change-Id: I276316e851918df227b7246766916fa8572f1b89
2010-11-18 14:54:02 -08:00
Gil Dobjanschi
b1fcb2abd3 Added IOException to WaveformData constructor
Change-Id: Ic00b582beaa2701ffa72e99194693fd7cfa45a6d
2010-11-18 14:35:12 -08:00
Gil Dobjanschi
91823e3b25 Merge "Disable ducking by default. Changed ducking threshold parameter range." 2010-11-17 18:34:59 -08:00
Jean-Michel Trivi
ffd0eb0f11 Fix bug 3183484 unhide MediaRecorder.AudioSource.VOICE_COMMUNICATION
Change-Id: I26cd88b1bb05de546415b1f92fbb9430e63b4eab
2010-11-17 17:45:34 -08:00
Gil Dobjanschi
0f76d9b1c2 Disable ducking by default. Changed ducking threshold parameter range.
Change-Id: I66a73b270466ced2ace9e3b10f82cfab1a1306bb
2010-11-17 16:20:34 -08:00
Mike Lockwood
413577d860 MTP: Fixes to allow file transfers > 4 gigabytes
BUG: 3198248

Change-Id: I6f11c79a19d7bdd63718a7370939124b1262d221
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-17 16:43:24 -05:00
Mike Lockwood
558cf79929 Merge "MTP: Set correct format for abstract audio playlists" 2010-11-17 12:50:28 -08:00
Mike Lockwood
0b58c19840 MTP: Set correct format for abstract audio playlists
Fixes a bad interaction with the media scanner that could result in
playlists getting duplicated or deleted after rebooting.

BUG: 3175649

Change-Id: I970234e86b24ac17d069aca085683d988abc7881
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-17 15:42:09 -05:00
Jean-Michel Trivi
05b07fd204 Merge "Add new audio mode for audio communications other than telelphony." 2010-11-17 09:49:23 -08:00
Gil Dobjanschi
3ee66f7b34 Merge "Invalidate transitions when the start time or duration of an effect or overlay changes." 2010-11-16 15:26:01 -08:00
Gil Dobjanschi
f1d8f2a140 Invalidate transitions when the start time or duration of an effect or overlay changes.
Change-Id: Ibc4d80e92ff46b4ecabed5b998f5b0f2c9ca3473
2010-11-16 11:37:08 -08:00
Jean-Michel Trivi
8f677d66d9 Add new audio mode for audio communications other than telelphony.
The audio mode MODE_IN_CALL signals the system the device a phone
 call is currently underway. There was no way for audio video
 chat or VoIP applications to signal a call is underway, but not
 using the telephony resources. This change introduces a new mode
 to address this. Changes in other parts of the system (java
 and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
 state variable directly, but to use two new convenience methods,
 isInCall() and isStateInCall(int) instead.

Change-Id: Id744cd26520ea1d1a4795eabe6a1f0c58789af76
2010-11-16 10:23:37 -08:00
Mike Lockwood
858caeaaa1 MediaScanner: Always use mime type provided to the media scanner
BUG: 3179926

Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-16 11:28:42 -05:00
Mike Lockwood
160b977c81 Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList" 2010-11-15 11:27:47 -08:00
Mike Lockwood
3159991e58 MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList
Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-15 14:10:04 -05:00
Andreas Huber
81a602958f Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser." 2010-11-15 10:07:17 -08:00
Andreas Huber
5dffd0e3af Add http live mime types to MediaFile, add support for playlist mime types to browser.
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
2010-11-15 08:54:40 -08:00
Mike Lockwood
e2ad6ec171 MTP: Partial implementation of the GetObjectPropList command
In this initial implementation we only support fetching one property at a time.
Support depth = 0 (single object) or depth = 1 (all objects in a directory)
Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former
is a special case of the latter.

Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650
Signed-off-by: Mike Lockwood <lockwood@google.com>
2010-11-15 11:46:51 -05:00
Mike Lockwood
44d47ad565 Merge "MediaScanner: Add support for importing file based playlists copied over MTP" 2010-11-15 08:39:00 -08:00
Gil Dobjanschi
75159247d8 Transition invalidation bug fix.
Change-Id: I2ca901a805e377fb7d3374281a986b82bcf02590
2010-11-12 15:29:57 -08:00
Mike Lockwood
caf7e43a40 MediaScanner: Add support for importing file based playlists copied over MTP
Change-Id: I53a9f204297ff29d4df994d2174bd6d6288f2c97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-12 18:23:19 -05:00
Gil Dobjanschi
0bf3075241 Merge "Invalidate transitions when an image media item duration changes." 2010-11-11 19:09:25 -08:00
Mike Lockwood
5c7d5ae094 Merge "MediaFile: Recognize MPG file extension as MPEG video" 2010-11-11 13:15:57 -08:00
Mike Lockwood
28d1a4aaf3 MediaFile: Recognize MPG file extension as MPEG video
Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-11 16:14:19 -05:00
Gil Dobjanschi
34fad15699 Invalidate transitions when an image media item duration changes.
Change-Id: I3cff920ef629df49dcfcb63065afeeb47a649287
2010-11-11 11:55:19 -08:00
Gil Dobjanschi
1fbeece669 Close the file input stream if the XML file parsing fails.
Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
2010-11-10 09:27:13 -08:00
Jean-Michel Trivi
820b9e0d3b Add recording source for voice communication
Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
2010-11-09 14:32:43 -08:00
Wu-cheng Li
482083c57f am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do not merge
* commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943':
  Use back-facing camera as default in camera/camcorder profile.do not merge
2010-11-08 23:56:20 -08:00
Wu-cheng Li
5680635f39 Use back-facing camera as default in camera/camcorder profile.
bug:3173302
Change-Id: Iae9565eb58949a1c9c2f2a1f5251b2df097ec167
2010-11-09 15:36:59 +08:00
Wu-cheng Li
f6bd761f94 Use back-facing camera as default in camera/camcorder profile.do not merge
bug:3173302
Change-Id: I11eaed32bb393206b560834d52c412f3e5a1a7d9
2010-11-09 14:11:45 +08:00
James Dong
d1604c7313 am 9cebb86c: am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
* commit '9cebb86c95ad4846ecc771e4b40d2dbd5cf1494b':
  Update a comment about when setOrientationHint() should be called
2010-11-08 20:43:10 -08:00
James Dong
9cebb86c95 am 1b2efbca: Merge "Update a comment about when setOrientationHint() should be called" into gingerbread
* commit '1b2efbca7120cf799d1242d277af354df7b0a9bb':
  Update a comment about when setOrientationHint() should be called
2010-11-08 20:14:19 -08:00
Gil Dobjanschi
8346ad0a8f Merge "Fix invalidateTransition method" 2010-11-08 19:06:41 -08:00