62699 Commits

Author SHA1 Message Date
Wink Saville
a3534ad4a4 am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit 'c97d0e43bacdae735071d6d7026175fbc4bdafca':
  Support suggestedRetryTime in CDMA DCT
2012-01-04 13:49:37 -08:00
Bart Sears
875b699281 am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '705665acda5fec6c8c76683b2e5850b0bd447449':
  Do not allow file:// access when it is disabled. Do not merge.
2012-01-04 13:49:34 -08:00
Wink Saville
c97d0e43ba Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1 2012-01-04 13:47:55 -08:00
Bart Sears
705665acda Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1 2012-01-04 13:47:09 -08:00
Eric Laurent
1a4b99396d am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
  audioflinger: fix clicks on 48kHz audio.
2012-01-04 13:00:49 -08:00
Eric Laurent
fb578b6b88 Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 2012-01-04 12:58:17 -08:00
Scott Main
319c3bcbb1 am c8810c2f: docs: add Teleepoch VID/driver info and update Huawei url
* commit 'c8810c2feb53bd423d0ef31bc10d22fc4cbf9c89':
  docs: add Teleepoch VID/driver info and update Huawei url
2012-01-04 12:01:02 -08:00
Scott Main
c8810c2feb docs: add Teleepoch VID/driver info
and update Huawei url

Change-Id: I4d6720d132f0d4e53bb25aa225327e38ba969881
2012-01-04 11:57:18 -08:00
Ben Murdoch
b2c63abcdc Do not allow file:// access when it is disabled. Do not merge.
Cherry pick of If2793f31cb37e0d3af15cb18e818bfa4058167fd

If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: I0ab84cde90c955d31077329fddebc25978287c64
2012-01-04 15:08:07 +00:00
Christopher Tate
91582b86d9 am 30ad699c: Merge "Tweak docs on \'adb logcat\'" into ics-mr1
* commit '30ad699c0e246ef3889f691361758235ecb89895':
  Tweak docs on 'adb logcat'
2012-01-03 17:40:53 -08:00
Christopher Tate
30ad699c0e Merge "Tweak docs on 'adb logcat'" into ics-mr1 2012-01-03 17:38:51 -08:00
Christopher Tate
1df51c65ea Tweak docs on 'adb logcat'
* Add description of 'threadtime' output format
* Remove description of highly-confusing and never-used 'thread' output format
* Adjust language slightly

Change-Id: I2dcc8b7e5e8c039659697e90d7a4b3746b9135e9
2012-01-03 16:50:50 -08:00
Scott Main
f65320a274 am 12d9954d: docs: dasboard update for 1/3/12
* commit '12d9954d198d29da1a15ba2c6947ce91839cbb83':
  docs: dasboard update for 1/3/12
2012-01-03 15:58:41 -08:00
Scott Main
12d9954d19 docs: dasboard update for 1/3/12
Change-Id: Ie584d9ee238b6d4a37c25dd7e30b0cf493cbfe47
2012-01-03 15:45:00 -08:00
Dirk Dougherty
27d2a07a55 am a17e100b: Doc change: fix link target for "Publish" icon.
* commit 'a17e100b7a192cae3935d2ae144fb1a1115a4ca7':
  Doc change: fix link target for "Publish" icon.
2012-01-03 10:35:18 -08:00
Dirk Dougherty
a17e100b7a Doc change: fix link target for "Publish" icon.
Change-Id: Iafc8db7e9ad7c42e5e2a1eaed2fb5b93a53e56f9
2012-01-03 10:09:29 -08:00
Scott Main
e231cd0a0d am 0582da68: docs: add links for Galaxy Nexus driver
* commit '0582da680ed3d48bfd9d6ed550f39aa2177baf79':
  docs: add links for Galaxy Nexus driver
2011-12-28 10:34:03 -08:00
Scott Main
0582da680e docs: add links for Galaxy Nexus driver
Change-Id: Iae875f70049f3b4561783e66e264eac802e8ae19
2011-12-27 15:52:11 -08:00
Eric Laurent
72dafb20e0 audioflinger: fix clicks on 48kHz audio.
The calculation done in prepareTracks_l() for the minimum amount
off frames needed to mix one output buffer had 2 issues:
- the additional sample needed for interpolation was not included
- the fact that the resampler does not acknowledge the frames consumed
immediately after each mixing round but only once all frames requested have been used
was not taken into account.
Thus the number of frames available in track buffer could be considered sufficient although
it was not and the resampler would abort producing a short silence perceived as a click.

Issue 5727099.

Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
2011-12-22 16:08:41 -08:00
Joe Fernandez
201469f545 am bb7f590a: Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
* commit 'bb7f590a5a539486de5127071c7ade8ec988d755':
  docs: Add developer guide cross-references, Project ACRE, round 4
2011-12-22 15:57:09 -08:00
Joe Fernandez
bb7f590a5a Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1 2011-12-22 15:55:00 -08:00
Joe Fernandez
3aef8e1d1b docs: Add developer guide cross-references, Project ACRE, round 4
Change-Id: I1b43414aaec8ea217b39a0d780c80a25409d0991
2011-12-22 15:08:23 -08:00
Roman Nurik
38daf3f122 am 38ee0dae: Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
* commit '38ee0dae2cf0ff1860973523e5cda6e38642e904':
  docs: Update App Widgets dev guide size discussion
2011-12-22 14:29:25 -08:00
Roman Nurik
38ee0dae2c Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1 2011-12-22 14:27:55 -08:00
Roman Nurik
2b43f3f444 docs: Update App Widgets dev guide size discussion
This is mainly an update to match the design guidelines.
See also bug 5555264.

Change-Id: I1c83fb33b7dca412905d21b588c5754d1d3c5cfe
2011-12-22 14:15:07 -08:00
The Android Open Source Project
7e4aa24c87 Reconcile with ics-mr1-release
Change-Id: Ic9251f762e0356c65eff1798cd5897a502d7981e
2011-12-21 07:19:20 -08:00
The Android Automerger
d7d7ff9660 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:27:07 -08:00
Kazuhiro Ondo
6de972a5c3 Support suggestedRetryTime in CDMA DCT
Support suggestedRetryTime in SETUP_DATA response in CDMA DCT.

Bug: 5740832
Change-Id: I4abd884bec76f1d9ee29d1ba36c7ea2cac9e0fb3
2011-12-20 17:04:52 -08:00
The Android Open Source Project
21cb1290b5 Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
2011-12-20 13:08:33 -08:00
John Wang
c01392816f am c892e177: Merge "Hide emergency call text if not support it." into ics-mr1
* commit 'c892e177c4f7a41e910c70f68d4e213589da1396':
  Hide emergency call text if not support it.
2011-12-20 10:43:13 -08:00
John Wang
c892e177c4 Merge "Hide emergency call text if not support it." into ics-mr1 2011-12-20 10:41:08 -08:00
Bill Gruber
c296892aa2 am 1d56f41c: Doc Fix: Sensors and Cameras
* commit '1d56f41c9d1dcccf1faef343047375cb14799678':
  Doc Fix: Sensors and Cameras
2011-12-19 17:45:24 -08:00
Bill Gruber
1d56f41c9d Doc Fix: Sensors and Cameras
Change-Id: I964a06e5224e59f3098f4d316db4d3b119a05a88
2011-12-19 17:32:47 -08:00
Scott Main
3204c52377 am 8f04ae36: docs: fix sidenav typo
* commit '8f04ae361cd34fdaea41fbedefb85cff2c684e36':
  docs: fix sidenav typo
2011-12-18 14:03:30 -08:00
Scott Main
8f04ae361c docs: fix sidenav typo
Change-Id: Ief250d461294ed99963cc8e9aa24c9f271e72b15
2011-12-18 14:00:41 -08:00
Scott Main
a2086cfc12 am df440164: docs: add driver info for Hisense
* commit 'df440164ba09bcce8b409bb5a2d4a4ef8f704148':
  docs: add driver info for Hisense
2011-12-16 12:56:33 -08:00
Scott Main
df440164ba docs: add driver info for Hisense
Change-Id: I95c09e7aa905345113112329c98d5f00e145b2bb
2011-12-16 12:52:58 -08:00
Roman Nurik
8cffc31810 am a8001e2a: am 00697a90: docs: Add missing intent flag to Android U nav class
* commit 'a8001e2ae908c413b626a82f5ab925f18559509c':
  docs: Add missing intent flag to Android U nav class
2011-12-16 12:07:27 -08:00
Roman Nurik
a8001e2ae9 am 00697a90: docs: Add missing intent flag to Android U nav class
* commit '00697a90bec4e0536cfa0873602b64bb6785022e':
  docs: Add missing intent flag to Android U nav class
2011-12-16 12:05:32 -08:00
The Android Automerger
bf35112b28 merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:35 -08:00
Justin Ho
9edb26ea55 am 043c5f8f: Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
* commit '043c5f8f1d9a8e9077e1c16af28509b30f00324d':
  Cherry-picking Id45abeba and Ia065dec6 for MR1
2011-12-16 11:54:01 -08:00
Justin Ho
043c5f8f1d Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1 2011-12-16 11:52:08 -08:00
Roman Nurik
00697a90be docs: Add missing intent flag to Android U nav class
Change-Id: I18eb286a8d8b2c70f7d894d1244d2568ce6ce6c0
2011-12-16 11:48:24 -08:00
Alexander Lucas
f5ed1d4c55 am 6469ee80: Merge "Fixed table labelling issues in \'Multiple Dimensions\' multiple apk lesson" into ics-mr1
* commit '6469ee8016d1e02673e05356b2590d3175dcd062':
  Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
2011-12-16 11:39:40 -08:00
Alexander Lucas
6469ee8016 Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1 2011-12-16 11:38:05 -08:00
Scott Main
5e7bed0b2a am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1
* commit '0f52d7666e83a7aa1979d65820ece865c7e1fd08':
  docs: fix whitespace in sidenav
2011-12-16 11:32:24 -08:00
Scott Main
0f52d7666e Merge "docs: fix whitespace in sidenav" into ics-mr1 2011-12-16 11:30:00 -08:00
Scott Main
edceed2359 docs: fix whitespace in sidenav
Change-Id: I7d8decaf122de1f632fdbd3ca5a1a34b3d1d91dd
2011-12-16 11:29:12 -08:00
Roman Nurik
1410f8a2a5 am 795c271f: am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit '795c271f448704561cd1312dd51826dca82f392f':
  docs: Minor link fix in Android U class
2011-12-16 11:25:02 -08:00
Roman Nurik
795c271f44 am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
* commit 'eb946fbdc800d56e1cbac515a1c73de806e74711':
  docs: Minor link fix in Android U class
2011-12-16 11:23:27 -08:00