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

1448 Commits

Author SHA1 Message Date
Mike Lockwood
c614df9650 AudioManager: Add wrapper methods for master volume support 
Change-Id: Ibfc24f052d05824175f71c2138ba041c94c3def7
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-16 11:30:47 -08:00
Mike Lockwood
47a0a8832f Merge "AudioManager: Add support for master mute" into ics-aah 2011-11-16 07:41:21 -08:00
James Dong
0e7d85fa93 am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:19:55 -08:00
James Dong
541e2e6695 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:16:45 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Jean-Michel Trivi
29270da5f7 am 4978c1a5: am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '4978c1a5b07782d622ca9e3eedd649a5927d226f':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:28:39 -08:00
Jean-Michel Trivi
08b2d32628 am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:21:43 -08:00
James Dong
89ca6983eb Document that release() should be called with onPause() and onStop() for media objects 
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
 2011-11-15 18:08:06 -08:00
Jean-Michel Trivi
e7edc86853 Fix 5623252 unlink to death of audio focus client early 
When removing an entry in the audio focus stack, don't wait for
 this object's finalizer to unlink to the death of the associated
 client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
 by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
 2011-11-15 17:41:05 -08:00
Jean-Michel Trivi
eb80b31b55 am 87597d9c: am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '87597d9ce00691f05703f728c17548df2bbc9cc2':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 13:06:57 -08:00
Mike Lockwood
cfbcd3bf21 AudioManager: Add support for master mute 
Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-15 09:57:33 -08:00
Jean-Michel Trivi
0dba46f9b2 am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 09:26:02 -08:00
Jean-Michel Trivi
a9509736c8 Fix 5615747 Don't leak remote control client death handlers 
Whenever a remote control stack entry is GC'd or removed from
 the stack, unlink its death handler.

Change-Id: Ia4ed6667351849fd388272591e24ffc16959beaf
 2011-11-14 17:30:23 -08:00
Jean-Michel Trivi
f1ec32db68 am 9d36a995: am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '9d36a99582518ed1a7fb005382e0128479b43e18':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:38:30 -08:00
Jean-Michel Trivi
09d936feb8 am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:36:11 -08:00
Glenn Kasten
527c44e8a4 Merge "Don't check return value of new for being == null" 2011-11-14 10:50:33 -08:00
Jean-Michel Trivi
de1f065be1 Fix 5607938 AudioFocusDeathHandler leaks GREF 
The AudioFocus death handler was correctly updating the audio
 focus stack when an audio focus client dies, but the death handler
 was leaking GREF if unlinkToDeath() is not called.
The fix consists in making sure unlinkToDeath() is always called
 by calling it in its finalizer.

Change-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5
 2011-11-11 16:13:48 -08:00
James Dong
0997fcb6db am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
  Unhide the key to retriever location information in 3gp/mp4 files
 2011-11-11 11:50:41 -08:00
James Dong
d9245e17dc am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1 
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
  Add support for retrieving location information in mp4/3gpp files
 2011-11-11 11:50:14 -08:00
Glenn Kasten
62b9aec7a0 Don't check return value of new for being == null 
new either succeeds or throws an exception

Change-Id: I1615e10c4f6730495c49e56b64714a00141ea8ff
 2011-11-11 07:30:19 -08:00
James Dong
00aa51b355 Unhide the key to retriever location information in 3gp/mp4 files 
Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130
related-to-bug: 5560253
 2011-11-11 01:49:01 -08:00
James Dong
77c500c9a1 Add support for retrieving location information in mp4/3gpp files 
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
 2011-11-10 11:40:11 -08:00
Eric Laurent
43f7bbdfbb am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1 
* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
  Fix problems in tablet silent mode.
 2011-11-10 16:30:51 +00:00
Eric Laurent
96a33d1caa Fix problems in tablet silent mode. 
Do not enter silent mode when ALARM stream volume is changed
to 0 by volume down key: Only RING, NOTIFICATION and MUSIC
streams control silent mode.

Report correct volume (0) for NOTIFICATION stream when silent mode
is entered by changing NOTIFICATION stream volume to 0 with
volume down key.

Change-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4
 2011-11-09 18:06:37 -08:00
Mike Lockwood
a2aa08e20c AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set. 
This allows Music2 and other media apps to control master volume without changing their code

Bug: 5567694

Change-Id: I48b6260b193b22c395be5a31cd1d270b2929a91e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-08 10:31:21 -08:00
Chih-Chung Chang
e271031f5b am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1 
* commit '713c9a331e226c970af57c59ff17be29b73025c1':
  Fix 5509346: Resize the thumbnails if it's too large.
 2011-11-08 07:02:13 +00:00
Chih-Chung Chang
b1224ff1c4 Fix 5509346: Resize the thumbnails if it's too large. 
Change-Id: I805f37f22cc745cfbc788f594da704e7e634f122
 2011-11-07 20:34:37 +08:00
Eric Laurent
4528548a06 am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
  Fix volume indication in vibrate mode.
 2011-10-31 23:26:07 +00:00
Eric Laurent
cd84197ac1 am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
 2011-10-31 23:23:15 +00:00
Eric Laurent
8ca9a1cf35 Fix volume indication in vibrate mode. 
The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
 2011-10-31 12:12:37 -07:00
Ed Heyl
92537e6ff2 merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed) 
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
 2011-10-31 06:06:27 -07:00
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
61fd1e8d8c docs: add developer guide cross references, Project ACRE, round 3 
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
 2011-10-28 14:23:23 -07:00
Mike Lockwood
5020e7e2d3 VolumePanel: Add support for master volume 
Change-Id: I3119eb2b7d3b5e7ce87f1660b50c10ab79c7bbdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-28 11:44:23 -04:00
Mike Lockwood
619f06444b Save and restore master volume in the settings provider 
Change-Id: I135c48155c41735c870e3934469c47f05bd74973
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-28 10:14:53 -04:00
Mike Lockwood
dff25597a9 Simple master volume support 
Still needs integration with Settings (for persistence) and VolumePanel UI.

Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-28 10:14:53 -04: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
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
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
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
0eb6ef1798 Merge "Support for an MPEG2 Program Stream extractor." 2011-10-13 10:03:26 -07:00
Jean-Michel Trivi
09b4d99822 DO NOT MERGE Fix 5389442 RemoteControlClient javadoc 
Extend RemoteControlClient class description with an example
 of instance creation showing how the PendingIntent is created
 and how it uses the same ComponentName as the one used
 in AudioManager.registerMediaButtonEventReceiver()

Change-Id: I1af61ddbf5cfb9160ea5b814bed7b881d51b7eff
 2011-10-11 18:59:34 -07:00
Jean-Michel Trivi
ad87f5b40f Fix 5389442 RemoteControlClient javadoc 
Extend RemoteControlClient class description with an example
 of instance creation showing how the PendingIntent is created
 and how it uses the same ComponentName as the one used
 in AudioManager.registerMediaButtonEventReceiver()

Change-Id: If8f050f94b112f9680ba6bf32ba622bc648fb1d0
 2011-10-11 14:09:23 -07:00