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

5467 Commits

Author SHA1 Message Date
Andreas Huber
4af012a790 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1 
* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
  Send RTSP control connection keep-alive requests
 2011-11-10 16:52:19 +00:00
Andreas Huber
ed894a5860 am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1 
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
  Don't believe the PV decoder's lies...
 2011-11-10 16:52:17 +00:00
Andreas Huber
bb2194c898 am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1 
* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
  There's no point in trying to continue to decode after an error was signalled.
 2011-11-10 16:49:12 +00:00
Andreas Huber
2375d16378 Merge "Send RTSP control connection keep-alive requests" into ics-mr1 2011-11-10 08:48:44 -08:00
Andreas Huber
b42aea5b4c Merge "Don't believe the PV decoder's lies..." into ics-mr1 2011-11-10 08:48:34 -08:00
Andreas Huber
7c063cf967 Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1 2011-11-10 08:47:25 -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
Glenn Kasten
a6e1ceefc6 am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 19:00:05 +00:00
Andreas Huber
3f99d95312 There's no point in trying to continue to decode after an error was signalled. 
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug: 5588658
 2011-11-09 10:26:06 -08:00
Andreas Huber
977702929b Don't believe the PV decoder's lies... 
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
 2011-11-09 10:03:07 -08:00
Glenn Kasten
f2c2b1c484 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 16:41:19 +00:00
Andreas Huber
a1b3e3d49e Send RTSP control connection keep-alive requests 
default to 60 secs unless overridden by server's session-id response.

Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug: 5562303
 2011-11-08 15:39:15 -08:00
Mike Lockwood
6026b825de Merge "AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set." into ics-aah 2011-11-08 11:09:54 -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
Andreas Huber
d6739fccfc am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1 
* commit '26f70db99f483be36caa7a4c84fec5de50bec034':
  Remove surface legacy APIs and code.
 2011-11-08 17:58:45 +00:00
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -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
713c9a331e Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1 2011-11-07 22:59:55 -08:00
James Dong
44e4983db4 am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 
* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
  Fix a hang issue where the first frame can be dropped for timelapse video recording.
 2011-11-08 06:58:11 +00:00
James Dong
ee7ebb3257 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -08: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
Glenn Kasten
f330986fa8 Bug 5478024 drop after decode if can't drop before 
Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
 2011-11-04 18:05:35 -07:00
Eric Laurent
9f71bb7ee6 am 914972be: Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 
* commit '914972be65bef1fd7e886825e7af27c29eff0a1e':
  Fix device management in lvm effect bundle wrapper.
 2011-11-04 15:32:13 +00:00
Eric Laurent
86a464557d am 79178b8b: Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 
* commit '79178b8b3da8f69f34a72be13f2a374afbec4f40':
  Fix problem in lvm effect bundle wrapper.
 2011-11-04 15:29:44 +00:00
Eric Laurent
914972be65 Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:29:30 -07:00
Eric Laurent
79178b8b3d Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:27:45 -07:00
Andreas Huber
efa4015ae3 DO NOT MERGE Poll input data with a small timeout and don't consume a full core. 
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
 2011-11-03 18:15:43 -07:00
Marco Nelissen
8f5de069c8 am f51f1bd9: Verify we actually have valid utf8 metadata 
* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
  Verify we actually have valid utf8 metadata
 2011-11-03 20:16:16 +00:00
Marco Nelissen
f51f1bd9d4 Verify we actually have valid utf8 metadata 
Before calling NewStringUTF, check that the metadata value is actually
valid utf-8, and replace the offending characters with "?" if it is not.
b/5534491

Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
 2011-11-03 13:12:16 -07:00
Andreas Huber
28db4fe051 am e395f645: Poll input data with a small timeout and don\'t consume a full core. 
* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
  Poll input data with a small timeout and don't consume a full core.
 2011-11-03 18:10:44 +00:00
Andreas Huber
e395f645aa Poll input data with a small timeout and don't consume a full core. 
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
 2011-11-03 11:00:21 -07:00
Eric Laurent
4aebcaaa85 am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1 
* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
  Remove unreliable effect tests.
 2011-11-03 15:47:23 +00:00
Eric Laurent
be5fc40fe7 Remove unreliable effect tests. 
Remove automated tests checking that audio effects are actually processing
the signal based on visualizer captures.
This method is too unreliable when used to measure energy at given frequencies and
often gives false negatives.

Issue 5542879.

Change-Id: Ib31158fd84ff9edc85712ec03c0c9957370c8f84
 2011-11-02 18:02:05 -07:00
Eric Laurent
8b4529e50b Fix problem in lvm effect bundle wrapper. 
When an effect is disabled, the process function should either
copy or accumulate the content of the input buffer to the output buffer
depending on the behavior requested by the framework.
Current implementation is copying the input buffer unconditionally.

Related to issue 5433942.

Change-Id: Ic488ca97eadcc4c763de570d7e6c6f5b7a979415
 2011-11-02 09:14:13 -07:00
Eric Laurent
b0c6e3bcf1 Fix device management in lvm effect bundle wrapper. 
The virtualizer and bass boost effects should be disabled when
not playing throught headsets or headphones.

There is a bug in current wrapper implementation that makes that those
effects are not disabled if the effect is enabled by the user after
the headset has been removed (current logic only works if the device selection
occurs while the effect is enabled).

Change-Id: I7c66b15a0339d95fb9ed13c8320d66379725d3b6
 2011-11-01 09:12:19 -07: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
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
27ed12492d Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 2011-10-28 09:13:54 -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