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

5337 Commits

Author SHA1 Message Date
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
Andreas Huber
f86639183d am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...
 2011-11-11 11:50:37 -08:00
Eric Laurent
9b5b5858e0 am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
  visualizer: reset buffer if playback is idle
 2011-11-11 11:50:28 -08:00
Andreas Huber
fa0da0e5a5 am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
  Instead of asserting, signal a runtime error if the session doesn't contain
 2011-11-11 11:50:23 -08:00
Andreas Huber
9a2bdea328 am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 
* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets
 2011-11-11 11:50:21 -08:00
Andreas Huber
1a85af68fc am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 
* commit 'd9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
  Disconnect on socket error on the RTSP control connection.
 2011-11-11 11:50:20 -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
James Dong
b7a000a6fb Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 2011-11-11 10:49:24 -08:00
Andreas Huber
2321718274 Merge "Didn't mean to check this in..." into ics-mr1 2011-11-11 10:46:02 -08:00
Andreas Huber
54c7efa4dd Didn't mean to check this in... 
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
 2011-11-11 10:17:00 -08:00
Eric Laurent
1f8c621279 Merge "visualizer: reset buffer if playback is idle" into ics-mr1 2011-11-11 08:17:22 -08:00
Andreas Huber
cd556b82fd Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1 2011-11-11 07:39:25 -08:00
Andreas Huber
5d42075e45 Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 2011-11-11 07:39:18 -08:00
Andreas Huber
d9f25bc941 Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 2011-11-11 07:39:11 -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
Andreas Huber
58c94bf434 Disconnect on socket error on the RTSP control connection. 
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
 2011-11-10 15:10:15 -08:00
Andreas Huber
4d7dff1706 DO NOT MERGE: Instead of asserting, remove active streams if their sockets 
return failure

Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug: 5593654
 2011-11-10 12:41:51 -08:00
Andreas Huber
57cc14fcc1 Instead of asserting, signal a runtime error if the session doesn't contain 
any playable tracks at all.

Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
 2011-11-10 12:40:30 -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
df8ab51ca6 visualizer: reset buffer if playback is idle 
Visualizer capture buffer must be reset if audio framework has stopped
calling process for a given period of time to get read of residual
data from previous captures.

Issue 5571920.

Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
 2011-11-10 10:27:05 -08:00
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