32991 Commits

Author SHA1 Message Date
Derek Sollenberger
babcb66076 Merge "Ensure full screen plugin is dismissed when necessary." 2010-10-01 08:50:51 -07:00
Kenny Root
2942391801 Fix regression in OBB key handling
Change-Id: If583cbdb8be68ffed094a5fde7ee00e1914c5841
2010-10-01 08:38:56 -07:00
Roy West
19e09bd6ef Merge "Cherrypick unmerged dev admin string edits from Gingerbread." 2010-10-01 08:30:49 -07:00
Derek Sollenberger
fa89c50ae7 Ensure full screen plugin is dismissed when necessary.
Dismiss the full screen plugin view when the user navigates to a
new page or tab. This ensures the plugin does not cover up new
content when the browser switches tabs or loads a new URL.

Change-Id: I35d65073dbc772ab5babd20287d4d2fe598178e5
http://b/2908332
2010-10-01 11:19:36 -04:00
Romain Guy
9affe86e9b Merge "Fix INVALID_OPERATION error with layers rendering." 2010-10-01 00:27:21 -07:00
Romain Guy
0bb5667b4e Fix INVALID_OPERATION error with layers rendering.
This change is a workaround for a driver bug that causes an INVALID_OPERATION
to be thrown on every glCopyTexSubImage() call. This change also adds a new
test for gradients local matrices.

Change-Id: I41b7437481026702d0a3a9677f099b4557c0a84e
2010-10-01 00:25:02 -07:00
James Dong
b5742452e0 Add a video record utility
Change-Id: I3aa7cadf399aa319ee9ca3f391fd8599742bfb7e
2010-09-30 21:40:14 -07:00
Dianne Hackborn
dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
2010-09-30 20:34:34 -07:00
Joe Onorato
557ed7aa29 am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit '0457db37de22d430df0e55a7552dcfe81b701627'

* commit '0457db37de22d430df0e55a7552dcfe81b701627':
  Use the private version of userActivity.
2010-09-30 19:48:31 -07:00
Kenny Root
9664b24172 am 8d85beca: am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '8d85beca80f0c84344ffb527ec7cab0ca7b53d4f'

* commit '8d85beca80f0c84344ffb527ec7cab0ca7b53d4f':
  Being already unmounted is not a failure
2010-09-30 19:48:27 -07:00
Chia-chi Yeh
82fb4ef335 am c38e6ae4: am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Merge commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4'

* commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4':
  RTP: Start AudioRecord before AudioTrack to avoid being disabled.
2010-09-30 19:47:49 -07:00
Eric Laurent
785c416ecf am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9'

* commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 19:47:21 -07:00
Kenny Root
13cc0a06fc am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterface
Merge commit '4309b52fe19de5241113d8f9ebcdf52741e086a9'

* commit '4309b52fe19de5241113d8f9ebcdf52741e086a9':
  Hash keys with MD5; track IBinders not IInterface
2010-09-30 19:47:06 -07:00
Kenny Root
fc32a60236 am 0f064de8: am 27358a69: Only allow 8 OBBs to be mounted by a UID
Merge commit '0f064de830d11ddb08a3c000b894b46aa530348a'

* commit '0f064de830d11ddb08a3c000b894b46aa530348a':
  Only allow 8 OBBs to be mounted by a UID
2010-09-30 19:47:00 -07:00
Kenny Root
9e95468bbb am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '6ce5f60c791401ed0faf5d36baf4fc6612358676'

* commit '6ce5f60c791401ed0faf5d36baf4fc6612358676':
  Remove OBBs from state list when volume unmounted
2010-09-30 19:46:46 -07:00
Hung-ying Tyan
1041bb7eec am 9af6b536: am 063d02bb: Merge "SipService: turn off verbose logging" into gingerbread
Merge commit '9af6b53676061db6fc9c18300dc7d8258f7306ab'

* commit '9af6b53676061db6fc9c18300dc7d8258f7306ab':
  SipService: turn off verbose logging
2010-09-30 19:46:40 -07:00
Steve Howard
e10330fa28 am efb8b427: am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Merge commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9'

* commit 'efb8b42789a291e38a7e837f64d18bcb511f65f9':
  Avoid NPE when viewing failed legacy download with no local path
2010-09-30 19:46:23 -07:00
Jake Hamby
980d40b568 resolved conflicts for merge of 738aadd7 to master
Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
2010-09-30 19:33:43 -07:00
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
2010-09-30 19:12:11 -07:00
Dianne Hackborn
0a69f59760 Merge "Rub in a little 'ol log-b-gone." into gingerbread 2010-09-30 19:03:38 -07:00
Jason Sams
37ece16cdc Merge "Add object validity checking." 2010-09-30 18:35:56 -07:00
Steve Howard
610c4359e4 A few additions to the download manager public API documentation
Change-Id: Icf831843e281d8eee9c1457273662121bb5a8609
2010-09-30 18:30:04 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone.
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
2010-09-30 18:27:22 -07:00
Joe Onorato
0457db37de am ab2e6284: Merge "Use the private version of userActivity." into gingerbread
Merge commit 'ab2e6284845794079d809e62c52c6c380b31c4b5' into gingerbread-plus-aosp

* commit 'ab2e6284845794079d809e62c52c6c380b31c4b5':
  Use the private version of userActivity.
2010-09-30 18:19:09 -07:00
Jason Sams
f166d9b5a2 Add object validity checking.
Change-Id: I2613e87b09a6e560f0381d4ed620d60a10bc30e4
2010-09-30 18:15:52 -07:00
Jeff Brown
52a4ac3f5e am 5d3cef8a: am e0c12c88: Merge "Move verbose logging of device capabilities to dumpsys." into gingerbread
Merge commit '5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe'

* commit '5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe':
  Move verbose logging of device capabilities to dumpsys.
2010-09-30 18:12:28 -07:00
Joe Onorato
ab2e628484 Merge "Use the private version of userActivity." into gingerbread 2010-09-30 18:12:24 -07:00
Eric Fischer
dcad41988f am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711'

* commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711':
  Import revised translations.  DO NOT MERGE
2010-09-30 18:12:08 -07:00
Kenny Root
8d85beca80 am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread
Merge commit '8b28441adab59f2bb0d92c8a717af75331249e08' into gingerbread-plus-aosp

* commit '8b28441adab59f2bb0d92c8a717af75331249e08':
  Being already unmounted is not a failure
2010-09-30 18:06:02 -07:00
Kenny Root
8b28441ada Merge "Being already unmounted is not a failure" into gingerbread 2010-09-30 18:03:25 -07:00
Chia-chi Yeh
c38e6ae400 am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Merge commit '274e3b5d752d1a4fd05352e50ad098d2f5b49a36' into gingerbread-plus-aosp

* commit '274e3b5d752d1a4fd05352e50ad098d2f5b49a36':
  RTP: Start AudioRecord before AudioTrack to avoid being disabled.
2010-09-30 18:02:38 -07:00
Kenny Root
4da02392a1 Being already unmounted is not a failure
Change-Id: I5943096444e3d4d4cc5fd63f64a09c32f649a227
2010-09-30 17:59:42 -07:00
Eric Laurent
de12c3cf56 am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread
Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp

* commit '220ab8877b234e6807b7f6d9028ba55d23220301':
  Issue 3032913: improve AudioTrack recovery time
2010-09-30 17:47:07 -07:00
Chia-chi Yeh
274e3b5d75 Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread 2010-09-30 17:41:09 -07:00
Eric Laurent
220ab8877b Merge "Issue 3032913: improve AudioTrack recovery time" into gingerbread 2010-09-30 17:39:36 -07:00
Kenny Root
4309b52fe1 am 735de3b3: Hash keys with MD5; track IBinders not IInterface
Merge commit '735de3b38abbd6564082a819377673ee593744a6' into gingerbread-plus-aosp

* commit '735de3b38abbd6564082a819377673ee593744a6':
  Hash keys with MD5; track IBinders not IInterface
2010-09-30 17:30:37 -07:00
Kenny Root
0f064de830 am 27358a69: Only allow 8 OBBs to be mounted by a UID
Merge commit '27358a69b33eaa268ee75ef778ec824c8085adcc' into gingerbread-plus-aosp

* commit '27358a69b33eaa268ee75ef778ec824c8085adcc':
  Only allow 8 OBBs to be mounted by a UID
2010-09-30 17:30:33 -07:00
Kenny Root
6ce5f60c79 am 38cf8867: Remove OBBs from state list when volume unmounted
Merge commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94' into gingerbread-plus-aosp

* commit '38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94':
  Remove OBBs from state list when volume unmounted
2010-09-30 17:30:22 -07:00
Kenny Root
fcf0f5734c am aff30c9b: am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread
Merge commit 'aff30c9b0db2c4e28afbe83436ab9024b67665cf'

* commit 'aff30c9b0db2c4e28afbe83436ab9024b67665cf':
  Fix location of gdbserver upon installation
2010-09-30 17:25:57 -07:00
Hung-ying Tyan
9af6b53676 am 063d02bb: Merge "SipService: turn off verbose logging" into gingerbread
Merge commit '063d02bb03a9260314b529490866528433148738' into gingerbread-plus-aosp

* commit '063d02bb03a9260314b529490866528433148738':
  SipService: turn off verbose logging
2010-09-30 17:25:30 -07:00
Kenny Root
735de3b38a Hash keys with MD5; track IBinders not IInterface
Using a plaintext password doesn't work unless it's a certain length, so
just hash the plaintext password with MD5 to make it the right length
for the twofish encryption.

Tracking the IInterface doesn't make much sense since it's different
each time, so track the IBinder instead. That way we can unlinkToDeath
the binder when the last thing it's holding onto goes away.

Change-Id: Id828d25b4d74f27e9d8b4bfb3909c964469cc473
2010-09-30 17:25:05 -07:00
Kenny Root
27358a69b3 Only allow 8 OBBs to be mounted by a UID
Change-Id: I4f017c5408af903c6c9ba007a2cf7f488a7fcd27
2010-09-30 17:24:53 -07:00
Kenny Root
38cf8867a8 Remove OBBs from state list when volume unmounted
Don't keep tracking OBBs when the volume they're located on goes away.
Remove them from our state tracking maps and then send a notification to
any listener that is still around.

Add a dump handler to MountService so the state of the mount lists
can be inspected.

Change the API to just make a callback directly to the change listener
when mount is called when it's already mounted or unmount called when
it's already unmounted.

Change-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc
2010-09-30 17:24:34 -07:00
Steve Howard
efb8b42789 am 4ba2817c: Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread
Merge commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db' into gingerbread-plus-aosp

* commit '4ba2817c869d4ec6b518a57ea32cc3765b18b0db':
  Avoid NPE when viewing failed legacy download with no local path
2010-09-30 17:22:35 -07:00
Eric Laurent
4712baab81 Issue 3032913: improve AudioTrack recovery time
This issue showed that when an AudioTrack underruns during a too long period
of time and is therefore disabled by audioflinger mixer, it takes an additional
delay of up to 3 seconds to recover.
This fix adds a simple mechanism to recover immediately when the client application
is ready to write data again in the AudioTrack buffer

Also throttle warnings on record overflows

Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
2010-09-30 17:21:23 -07:00
Hung-ying Tyan
063d02bb03 Merge "SipService: turn off verbose logging" into gingerbread 2010-09-30 17:20:25 -07:00
Chia-chi Yeh
67ecb5b90c RTP: Start AudioRecord before AudioTrack to avoid being disabled.
Change-Id: I96be89fda41d77e2cf5bfc1c2f14e2b109001b57
2010-10-01 08:20:09 +08:00
Christopher Tate
1a74cc347a Merge "Drag/drop APIs and infrastructure" 2010-09-30 17:04:31 -07:00
Romain Guy
be0488db81 Merge "Make simple paths made of lines work." 2010-09-30 16:59:29 -07:00
Romain Guy
d799912770 Make simple paths made of lines work.
Bug #3041098

Change-Id: Ife9c3f01ded10e2bb35b1cdf1a54734d8347fee4
2010-09-30 16:57:13 -07:00