32957 Commits

Author SHA1 Message Date
Andreas Huber
a424f7c628 Start playing live streams from the start, no the middle...
Change-Id: Ie01ba1250b51155cb1fb32fc3340189a16c01476
related-to-bug: 2368598
2010-10-01 11:28:44 -07:00
Andreas Huber
d6d5cfb914 am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp

* commit '469b80336368bef3742e97c15e9017c1f2d404ae':
  Remove development-only code.
2010-10-01 11:25:57 -07:00
Andreas Huber
469b803363 Merge "Remove development-only code." into gingerbread 2010-10-01 11:23:24 -07:00
Erik
b0eee7df01 am 277465fb: am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread
Merge commit '277465fb5bfc74716f194f1abc2befb42ed73590'

* commit '277465fb5bfc74716f194f1abc2befb42ed73590':
  b/3054044 Make allDay event times format in utc
2010-10-01 11:21:21 -07:00
Andreas Huber
1981bd034a am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'

* commit '14401bf7bca34c692f248406c78bd8b49783217a':
  Squashed commit of the following:
2010-10-01 11:21:16 -07:00
Andreas Huber
21d28a2a13 Remove development-only code.
Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug: 2368598
2010-10-01 11:19:26 -07:00
Fabrice Di Meglio
04686f4289 Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
- fix NPE
- code cleaning

Change-Id: Ieb30b666d995de8cbd27ee6d17e2178e7ea670f6
2010-10-01 11:16:10 -07:00
Erik
277465fb5b am 57bd0615: Merge "b/3054044 Make allDay event times format in utc" into gingerbread
Merge commit '57bd0615fa48124c4607fbb1ba09a7c7160be146' into gingerbread-plus-aosp

* commit '57bd0615fa48124c4607fbb1ba09a7c7160be146':
  b/3054044 Make allDay event times format in utc
2010-10-01 11:10:59 -07:00
Erik
57bd0615fa Merge "b/3054044 Make allDay event times format in utc" into gingerbread 2010-10-01 11:08:13 -07:00
Andreas Huber
14401bf7bc am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following:
2010-10-01 11:03:47 -07:00
Andreas Huber
d1398db35c Merge "Squashed commit of the following:" into gingerbread 2010-10-01 11:01:33 -07:00
Erik
d762a347fb b/3054044 Make allDay event times format in utc
AllDay events could get formatted with the local time zone
instead of utc. This makes it so that using the utc flag in the
wrapper for formatting correctly passes in UTC as the time zone.

Change-Id: I65090ef939ce64c1a942c7683cf76a927c02cb53
2010-10-01 11:01:01 -07:00
Andreas Huber
b72c7e36a2 Squashed commit of the following:
commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 30 16:44:57 2010 -0700

    better separation of access units

    Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c

commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date:   Thu Sep 30 15:35:01 2010 -0700

    Support for ES packets that do not start on PES packet boundaries.

    Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
    related-to-bug: 2368598

Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
2010-10-01 10:51:41 -07:00
Leon Scroggins III
e2dc5260d9 Create dummy assets for text selection actions.
The new assets are just copies of old assets.  However, now
the code is set up properly, and when we do get final
assets no new code needs to be written, and both TextView
and the select action mode for the browser will be updated.

Change-Id: I9a1461bf447f6bbc2782d8f948d873cbeeccbcb0
2010-10-01 13:50:59 -04:00
Kenny Root
d1034c1967 am 637a8d84: am 29423918: Fix regression in OBB key handling
Merge commit '637a8d84bacd0b6973a16843259f0c11845f2cd2'

* commit '637a8d84bacd0b6973a16843259f0c11845f2cd2':
  Fix regression in OBB key handling
2010-10-01 09:07:34 -07:00
Kenny Root
637a8d84ba am 29423918: Fix regression in OBB key handling
Merge commit '2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp

* commit '2942391801b79816c5eb77d7ac94c4a65f26af48':
  Fix regression in OBB key handling
2010-10-01 08:55:53 -07:00
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