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

724 Commits

Author SHA1 Message Date
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
Gil Dobjanschi
549a65b5a4 Fix invalidateTransition method 
Change-Id: I12d5b7256d2956007b65c8304053717dd7b9b7ef
 2010-11-08 18:44:43 -08:00
Joe Onorato
51387974f0 Merge "Move the volume, media, call, camera and search key handling from PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors." 2010-11-08 10:59:27 -08:00
James Dong
5aa95dd36c Update a comment about when setOrientationHint() should be called 
Change-Id: I389089390a552ee7a86823c050048dcec0a0eb2a
 2010-11-08 10:36:53 -08:00
Wu-cheng Li
76f15bcb8b Do not use CAMERA_ID_DEFAULT because it is removed. 
bug:3173302
Change-Id: I360e55f2665b2e121c8cf017e17c4cb4dd181e88
 2010-11-08 23:40:29 +08:00
James Dong
08caf9e84f am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread 
* commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3':
  Add a new public API to support recording rotated videos
 2010-11-06 16:25:39 -07:00
James Dong
bb97d7bbf3 am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread 
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
  Add a new public API to support recording rotated videos
 2010-11-06 14:21:53 -07:00
Owen Lin
a726e12fb7 Merge "Add more EXIF tags." 2010-11-06 01:20:19 -07:00
Joe Onorato
86f6786032 Move the volume, media, call, camera and search key handling from 
PhoneWindow to a new PhoneFallbackEventHandler class that is used
for all windows, not just ones with decors.

Bug: 3155146
Change-Id: Ib070fa3e523e3564b225bca576c08012fef4f416
 2010-11-05 18:58:29 -07:00
Gil Dobjanschi
d141305f93 Fix: FileInputStream not closed after parsing XML file 
Change-Id: I8ea69738d5ba1e91c9c759f76c49a8a324c24b88
 2010-11-05 17:41:42 -07:00
Gil Dobjanschi
c7481cd56f Merge "Added an export method without codec parameters." 2010-11-05 17:39:04 -07:00
James Dong
ad8f19c6b3 Add a new public API to support recording rotated videos 
o changed a comment about the rotation orientation from counter-clockwise
  to clockwise.

Change-Id: I16ad73ce1a55cc627d9a516e23d1325753b3037e
 2010-11-05 15:53:00 -07:00
Mike Lockwood
250528e5b2 MediaScanner: Fix mismatch between internal and external file paths. 
Change-Id: If2fac90a466c4d63fc90f96e91733c9e9ca14680
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-05 17:31:03 -04:00
Gil Dobjanschi
c006e8ef64 Added an export method without codec parameters. 
Change-Id: If0a1c34f2266c441cd16c46da5c07ab1a509314b
 2010-11-05 11:59:15 -07:00
Ray Chen
4414eb4b29 Add more EXIF tags. 
Change-Id: I77a02a6de6bb4c364bb9718f7bed15468a38a279
 2010-11-05 16:18:29 +08:00
Gil Dobjanschi
a7ccd13083 Merge "Added audio and video codec parameters to the export method." 2010-11-04 15:43:54 -07:00
Gil Dobjanschi
289f08990c Added audio and video codec parameters to the export method. 
Change-Id: I1badd08ce7148da540bf91df0e19c3da59287756
 2010-11-04 15:35:42 -07:00
James Dong
c25c28a496 am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread 
* commit 'c0fa1d4791667ee8d1a9685749e42426fe8bd38b':
  Revert "Support rotation in media recorder"
 2010-11-03 19:44:45 -07:00
James Dong
c80c28801d Revert "Support rotation in media recorder" 
This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
 2010-11-03 19:22:47 -07:00
Hiroshi Lockheimer
0ce42c9d31 am c181a082: Merge "Support rotation in media recorder" into gingerbread 
* commit 'c181a08209dc85c80e4da5d20cd3980998def40d':
  Support rotation in media recorder
 2010-11-03 17:59:43 -07:00
James Dong
f1febe470a Support rotation in media recorder 
o needs to be tested with camera hal and camcorder application

Change-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232
 2010-11-03 17:49:55 -07:00
Praveen Bharathi
26e3734983 frameworks/base: switch audio to hdmi when cable is plugged in 
Change-Id: I01c4ee968bc0ffbb6ce75370935571cc1ff6f8c7
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2010-11-03 15:38:12 -07:00
Jaikumar Ganesh
de04e5242a Merge "Add STATE_AUDIO_CONNECTING state." 2010-11-03 14:58:00 -07:00
Jaikumar Ganesh
30d181690e Add STATE_AUDIO_CONNECTING state. 
Why is it needed: SCO audio connections can fail.
Currently no indication is given to clients which are waiting
for SCO connections. This was working fine before because
SCO connections where blocking calls, which was wrong in itself.

Change-Id: Ic449b2db8506a7a5ae6be6c68715f1a7343f9e40
 2010-11-03 11:05:12 -07:00
Gil Dobjanschi
82415bed34 Merge "Use SoftReference for WaveformData" 2010-11-02 20:26:22 -07:00