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

5425 Commits

Author SHA1 Message Date
Amith Yamasani
18936d7d1d am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
 2011-10-30 21:37:09 +00:00
Joe Fernandez
74b2b95473 am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
  docs: add developer guide cross references, Project ACRE, round 3
 2011-10-29 02:16:10 +00:00
Amith Yamasani
69e640ee84 Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
Amith Yamasani
c696a53d1f Bring back the old-style Ring/Vibrate/Silent states when using volume keys. 
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
 2011-10-28 18:40:43 -07:00
Joe Fernandez
09848bc89d Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 2011-10-28 15:40:11 -07:00
Joe Fernandez
61fd1e8d8c docs: add developer guide cross references, Project ACRE, round 3 
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
 2011-10-28 14:23:23 -07:00
Andreas Huber
95be24585f Remove surface legacy APIs and code. 
All surfaces are now supported through surface textures.

Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
 2011-10-28 09:39:23 -07:00
Andreas Huber
e10d9126e5 am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1 
* commit '27ed12492dfbec6ec67b66ff3cf60febce370b01':
  Properly report that we're no longer playing after receiving event
 2011-10-28 16:17:54 +00:00
Andreas Huber
27ed12492d Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 2011-10-28 09:13:54 -07:00
Jamie Gennis
e396e993a5 am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 
* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
  Stagefright: ANW::connect in MediaPlayerService
 2011-10-28 02:53:20 +00:00
Jamie Gennis
fc9592f8a5 am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
  Stagefright: ANW::connect in MediaPlayerService
 2011-10-28 02:14:01 +00:00
James Dong
21122cb44e am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 
* commit 'da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
  Report call status from AudioSource::start() to file writer
 2011-10-27 22:28:08 +00:00
James Dong
da57c0e8cf Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 2011-10-27 15:24:28 -07:00
James Dong
b4a9fd9faf am 17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 
* commit '17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
  Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
 2011-10-27 21:13:54 +00:00
James Dong
17a5fb36f8 Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 2011-10-27 14:09:50 -07:00
Andreas Huber
0a69dc0719 am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 
* commit '1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
  Fix a reference to a stale pointer in AwesomePlayer.
 2011-10-27 16:11:56 +00:00
Andreas Huber
1388aced2a Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 2011-10-27 09:07:23 -07:00
James Dong
33fe290ca3 Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording. 
Change-Id: I328d9fa83a381415d7648218a6fb93b3724bbcc6
related-to-bug: 5343832
 2011-10-27 08:47:07 -07:00
James Dong
b888fd1306 Fix a hang issue where the first frame can be dropped for timelapse video recording. 
Change-Id: I04754f1005a983953a80a659ff13f8762d0e120c
related-to-bug: 5523502
 2011-10-26 23:47:55 -07:00
James Dong
02b32fc33a Report call status from AudioSource::start() to file writer 
Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330
related-to-bug: 5514288
 2011-10-26 23:35:01 -07:00
Jamie Gennis
2fa0ac2e44 Stagefright: ANW::connect in MediaPlayerService 
This change moves the ANativeWindow connect and disconnect logic from
MediaPlayer to MediaPlayerService::Client.

Bug: 5502654
Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
 2011-10-26 18:40:00 -07:00
Andreas Huber
e96e84b577 Properly report that we're no longer playing after receiving event 
MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR.

Change-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3
 2011-10-26 15:23:31 -07:00
Jamie Gennis
8b5c6efdbc am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0 
* commit '5ded5fc55f2da2af0a76a9ddc52d27948b227037':
  Stagefright: push blank buffers when tearing down
 2011-10-26 20:39:25 +00:00
Jamie Gennis
5ded5fc55f am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0 
* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
  Stagefright: push blank buffers when tearing down
 2011-10-26 20:34:38 +00:00
Andreas Huber
d2b76d707b Fix a reference to a stale pointer in AwesomePlayer. 
The pointer returned by MetaData::findCString may become stale if the metadata
object is modified. Make a copy of the returned mime type in order to prevent
MediaPlayer::dump log corruption.

Change-Id: I9077aee36c4316d83b37fb909bf91e6b3f75d5d2
 2011-10-26 12:35:03 -07:00
Steve Block
71f2cf116a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
 2011-10-26 09:57:54 +01:00
Jamie Gennis
c0e4293794 Stagefright: push blank buffers when tearing down 
This change makes OMXCodec push RGB 565 buffers filled with black to an
ANativeWindow when tearing down after decoding to protected gralloc
buffers.  This allows the OMX tear down to zero out any protected
buffers that were used without the possibility that the buffer is still
being used by SurfaceFlinger or HWComposer.

Bug: 5483222
Change-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560
 2011-10-25 18:35:02 -07:00
Dave Burke
149a14931e am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 
* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
  Stagefright: idle OMX after ANW errors
 2011-10-19 22:38:45 -07:00
Dave Burke
23d644202a Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 2011-10-19 22:37:18 -07:00
Jamie Gennis
6607b39baa Stagefright: idle OMX after ANW errors 
This change fixes an issue in Stagefright where the state of an OMXCodec
object can get out of sync with the state of the OMX component.  In
particular, if one of the ANativeWindow functions failed and put the
OMXCodec into the ERROR state, this would cause Stagefright to skip
doing the Executing -> Idle transition.  Without this transition the
freeBuffersOnPort call would never be made, and the MediaBuffers would
end up being leaked (which would also leak the Gralloc buffers they
reference).

Bug: 5333695
Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
 2011-10-19 21:22:19 -07:00
James Dong
c7d927466e am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0 
* commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
  Check whether media recorder client exists before dumping.
 2011-10-19 17:57:58 -07:00
Marco Nelissen
e68a6936c7 Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class." 2011-10-19 07:50:24 -07:00
James Dong
dc8bbe79b8 Check whether media recorder client exists before dumping. 
Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82
related-to-bug: 5477177
 2011-10-18 22:29:20 -07:00
James Dong
3c563ce672 am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 
* commit '5264f6003bbcb8ca70df034379154914260cc322':
  Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
 2011-10-18 22:17:34 -07:00
James Dong
5a37afa87c Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). 
Avoid infinite loop in querying omx component about the supported color format.

Change-Id: I4997efd36462c792a6d8b5e04c79a80966a559fe
related-to-bug: 5466057
 2011-10-18 16:27:53 -07:00
Eric Laurent
46c8f1535a am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 
* commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd':
  Fix issue 5462427: Volume should never be 0 ...
 2011-10-17 19:50:36 -07:00
Eric Laurent
c0a87dc10c Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 2011-10-17 19:48:31 -07:00
Dave Burke
499e252245 am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 
* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
  Don't hold onto the lock while reconnecting to the server
 2011-10-17 18:36:48 -07:00
Dave Burke
6f13adb22a Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0 2011-10-17 18:35:11 -07:00
Andreas Huber
96e35f2e57 Don't hold onto the lock while reconnecting to the server 
to avoid stalling the readers.

Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
 2011-10-17 15:49:01 -07:00
Jamie Gennis
29fe8cb941 am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0 
* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
  MediaPlayer: properly handle released surfaces
 2011-10-17 12:40:49 -07:00
Jamie Gennis
f76afc80d2 MediaPlayer: properly handle released surfaces 
Bug: 5396571
Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
 2011-10-14 19:55:12 -07:00
Eric Laurent
b024c30a80 Fix issue 5462427: Volume should never be 0 ... 
Make sure that ring or notification volume index
never reaches 0 unless in silent mode.
Conversely, enter silent mode when this volume is set to 0.

Change-Id: Iff5e5e972b607f4736e7a704b26b2dadb40074b0
 2011-10-14 17:19:27 -07:00
Eric Laurent
e04783ccde am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0 
* commit '615858a8ebb12b3541fd709e6e965ac814880261':
  Indicate screen off condition to audio framework.
 2011-10-14 12:58:40 -07:00
Eric Laurent
950e8cb40a Indicate screen off condition to audio framework. 
Add a mechanism for AudioService to notify audio framework and audio HAL
that screen is turned on or off. This indication can be used by lower
audio layers to trigger low power audio playback mode.
Current implementaiton based on setParameters() method is experimental
and will be replaced by a different interface when ready.

Change-Id: Ie72ada0a8edec3d71b47681b9f51cb5bc839d45b
 2011-10-14 11:40:24 -07:00
Jean-Michel Trivi
414b74c564 am e48440d5: Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0 
* commit 'e48440d59a52c0f13166da2fd32023356d9215d9':
  Fix 5153611 remove remote control client/display log from AudioService
 2011-10-14 08:46:08 -07:00
Jean-Michel Trivi
7ff866e8cf Fix 5153611 remove remote control client/display log from AudioService 
Do not log debug messages for the RemoteControlClient and
 IRemoteControlDisplay related features.

Change-Id: I81bfeec1770f81b78b679dc03fb40806393b170a
 2011-10-13 18:09:26 -07:00
Andreas Huber
a6be6dcd03 NuPlayer is now taking on the task of streaming over RTSP. 
Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
 2011-10-13 11:31:06 -07:00
Andreas Huber
0eb6ef1798 Merge "Support for an MPEG2 Program Stream extractor." 2011-10-13 10:03:26 -07:00
Mike Lockwood
8334038f9e MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size 
Bug: 5432487

Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-13 11:38:20 -04:00