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

48044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
931b7f269c Merge "Fix issue 3509396: AudioEffect.getParameter JAVA." 2011-03-21 17:51:25 -07:00
Teng-Hui Zhu
217c6c7fbe am 67440893: am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '67440893ee32f057d2695b0eea9811e289b68603':
  Support loading image and paused image for inline video
 2011-03-21 17:48:59 -07:00
Teng-Hui Zhu
cd44562455 Fix a crash 
bug:4139931
Change-Id: Ifc18f964d5aedb268eb0d5fa08db3ffed1de4ff8
 2011-03-21 17:38:21 -07:00
Yu Shan Emily Lau
0210997218 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Gloria Wang
7abedd0cde Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 2011-03-21 17:26:03 -07:00
Eric Laurent
602b3286ff Fix issue 3509396: AudioEffect.getParameter JAVA. 
Removed dead/buggy code in AudioEffect.getParameter() and
AudioEffect.command() that was meant to return the actual length of
meaningful data in the returned parameter or command reply.

This is replaced by the method return status indicating this length when
positive (negative return codes still indicate the same errors as before).

Modified automated AudioEffect tests accordingly.

Change-Id: Ie89617f912766b8dee73b81f92af9c48027c982d
 2011-03-21 17:11:59 -07:00
Carl Shapiro
8f4c49d86e Merge "Remove dead code from the Zygote initialization." 2011-03-21 17:04:25 -07:00
Gloria Wang
ee4084bf06 do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624. 
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
 2011-03-21 16:53:14 -07:00
Justin Ho
9db9a7d3f4 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Carl Shapiro
f973eaae08 Remove dead code from the Zygote initialization. 
Change-Id: Iad66437d6dae01ab94cfade86f3f7416a2896728
 2011-03-21 16:49:16 -07:00
Andreas Huber
8505f2fe1e DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue. 
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
 2011-03-21 16:45:25 -07:00
Andreas Huber
b57816957a Merge "Enable http-live support for https:// urls, fix a parsing issue." 2011-03-21 16:36:37 -07:00
Andreas Huber
554d0ea10f Enable http-live support for https:// urls, fix a parsing issue. 
Change-Id: I2284e1d62babde7f739fba6a3cb4e2619f0e62f9
related-to-bug: 4148291
 2011-03-21 16:34:02 -07:00
Teng-Hui Zhu
67440893ee am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
  Support loading image and paused image for inline video
 2011-03-21 16:28:04 -07:00
Andreas Huber
970d7dd95f am e2c32e9f: If nothing is to be copied, return right away. 
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
  If nothing is to be copied, return right away.
 2011-03-21 16:21:29 -07:00
Vasu Nori
cc1eaf6f7b bug:4090903 allow bindargs on attach database statement 
code incorrectly assumed that certain statements (like ATTACH DATABASE)
will never have bindargs.

Change-Id: I62eddbdf8e15947e8debf5052c7248113a3b9b57
 2011-03-21 16:02:25 -07:00
Vasu Nori
b2613555f6 Merge "fix broken logTimeStat stuff" 2011-03-21 15:52:43 -07:00
Romain Guy
36a58a5440 Merge "Update GL textures when changing a Bitmap's pixels Bug #4146495" 2011-03-21 15:31:00 -07:00
Romain Guy
1a81aea814 Update GL textures when changing a Bitmap's pixels 
Bug #4146495

Change-Id: I4fe3f8501373b86b164af11ae51642b140035bb8
 2011-03-21 15:30:27 -07:00
James Dong
d03970991d Merge "Add read and write option in opening file for output in the writers" 2011-03-21 15:13:14 -07:00
Justin Ho
c16168091a Fixing list selector theme 
Bug: 4147203

Change-Id: Ib9052ca399a135d42fd5c6ccf2bea8babfe8f0ac
 2011-03-21 15:04:23 -07:00
Gloria Wang
c02506b82a Merge "Fix for 4084554. DRM framework support for enabling/disabling copy control settings from a DRM plugin" 2011-03-21 15:01:00 -07:00
James Dong
f84433fb0a Add read and write option in opening file for output in the writers 
Change-Id: Ibfba0aacd3c8587c04a2e903b636de337cc30104
 2011-03-21 14:27:30 -07:00
Teng-Hui Zhu
f82e5a2c90 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00
Andreas Huber
e2c32e9f96 If nothing is to be copied, return right away. 
This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
 2011-03-21 14:16:03 -07:00
Eric Laurent
7a4b8bd588 Merge "Fix issue 3483718: audio streaming and A2DP." 2011-03-21 14:06:33 -07:00
Teng-Hui Zhu
0b933c02dd Merge "Support loading image and paused image for inline video" into honeycomb-mr1 2011-03-21 14:01:10 -07:00
Gloria Wang
3bbeaacfc0 Fix for 4084554. 
DRM framework support for enabling/disabling copy control settings from a DRM plugin

Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
 2011-03-21 13:50:04 -07:00
Romain Guy
43e7aeb37e Merge "Add support for drawPoint() and drawPoints()." 2011-03-21 13:12:28 -07:00
Romain Guy
ed6fcb034b Add support for drawPoint() and drawPoints(). 
Change-Id: I01bef50c08ec3160f8d40dc060b2cf6c2e4d7639
 2011-03-21 13:11:49 -07:00
Andreas Huber
5bb357f4cc Fixing the build. 
Change-Id: I89daa503029491e6f1a8321f7e45c9439315ad23
 2011-03-21 11:55:01 -07:00
Eric Laurent
6667ac33f4 Fix issue 3483718: audio streaming and A2DP. 
The problem is that when switching from A2DP to device speakers or headset,
The AudioTrack binder interface to AudioFlinger must be destroyed and restored
to accomodate new buffer size requirements. Current AudioTrack implementation
did not restore properly the PCM buffer write index which caused a mismatch between
the written frame count in the mediaplayer renderer and the AudioTrack. The renderer
could then believe the AudioTrack buffer was full and stop writing data preventing the
AudioTrack to reach a bufffer full condition and resume playback.

The rendered was also modified to refresh the AudioTrack frame count (buffer size)
inside the write loop in NuPlayer::Renderer::onDrainAudioQueue() as this count can change
from one write to the next.

Also modified AudioTrack::obtainBuffer() to check for track invalidated status before
querying for available space in the buffer. This avoids writing to the old track's
buffer until full before detecting the invalidated condition and create a new track.

Change-Id: I16a857e464e466880847f52f640820aa271539ad
 2011-03-21 11:49:00 -07:00
Andreas Huber
14a80afa51 Merge "Support passing headers to MediaMetadataRetriever's setDataSource API" 2011-03-21 11:23:15 -07:00
Andreas Huber
5b7ced6a4e Support passing headers to MediaMetadataRetriever's setDataSource API 
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
 2011-03-21 11:13:59 -07:00
James Dong
294a6e420f Merge "Scale the thumbnail if display dimension is different from the actual buffer size" 2011-03-21 11:07:18 -07:00
Justin Ho
90298b56e5 am 3f29ffa5: am 38cf000a: am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '3f29ffa56c5204fd3dc5587479b8a1c688665e41':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:58:50 -07:00
Justin Ho
3f29ffa56c am 38cf000a: am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '38cf000a541206769ad7686936e49bf0c1e417b9':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:56:41 -07:00
Justin Ho
38cf000a54 am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '5e35c4855a972960403a10811882ebded8945006':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:54:51 -07:00
Teng-Hui Zhu
265db32f31 Support loading image and paused image for inline video 
bug:4142131

Change-Id: I28d82a8e30a2146a3380c63dcdcbd51228f23f56
 2011-03-21 10:36:00 -07:00
Justin Ho
5e35c4855a Updated 3G and wifi traffic indicators 
Change-Id: I3bc61067d4c30e9cda6170e87552d93c2a084895
 2011-03-21 08:42:54 -07:00
Daniel Sandler
affb58e727 Fix build. 
See Change Ie70ac630

Change-Id: Ifffd53dbe17be64e6234bc6371f44b84c3e123e4
 2011-03-21 10:27:18 -04:00
Mike Lockwood
4bb07bbd89 am 35fb9ea8: (-s ours) am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
* commit '35fb9ea84db148251973e1266904fd0949a6b2b1':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:50:53 -07:00
Mike Lockwood
35fb9ea84d am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
* commit '9a612b545e2c5249bfd8ef2b7673197b8f214cbd':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:49:21 -07:00
Mike Lockwood
7672db5968 am 433567b5: am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit '433567b57c96525fb6c1c39e8ccb9780548441ba':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:40:07 -07:00
Mike Lockwood
9a612b545e am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
* commit '65de3c76874386a5c1ffd26690451ecdef972a9e':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:37:33 -07:00
Mike Lockwood
433567b57c am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit '56063c8d62d0574409a8150d580993c8d8e0f14f':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:33:01 -07:00
Mike Lockwood
56063c8d62 am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:25:09 -07:00
Mike Lockwood
dd76dc0297 Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 2011-03-20 17:08:24 -07:00
James Dong
9f2cde3cdb Scale the thumbnail if display dimension is different from the actual buffer size 
bug - 3379293

Change-Id: I31c08010c97387716433da99d648bd364847b6aa
 2011-03-20 14:46:30 -07:00
Mike Lockwood
65de3c7687 DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
Bug: 4129297

Change-Id: I33963b0a667976d8100a60b27d66bfd0d57373e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-19 14:38:54 -04:00