Eric Laurent
05683c8596
am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
...
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
2012-01-18 16:08:06 -08:00
Wink Saville
7b6231a44e
am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
...
* commit 'aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
2012-01-18 16:05:43 -08:00
Eric Laurent
db2e716359
Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
2012-01-18 16:05:31 -08:00
Wink Saville
aba7985101
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
2012-01-18 16:03:24 -08:00
Adam Powell
a6a0d134eb
am 04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
...
* commit '04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
2012-01-18 14:49:30 -08:00
Adam Powell
04f3848986
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
2012-01-18 14:47:20 -08:00
Robert Ly
c891c6eff7
am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
...
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
2012-01-18 13:19:52 -08:00
Robert Ly
43fda84e91
am 6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
...
* commit '6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
2012-01-18 13:19:50 -08:00
Robert Ly
013dbcf078
Merge "docs: adding rs api docs" into ics-mr1
2012-01-18 13:18:11 -08:00
Robert Ly
6ad9ea7deb
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
2012-01-18 13:17:51 -08:00
Joe Fernandez
58f9c3da34
am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
...
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
2012-01-18 12:35:30 -08:00
Joe Fernandez
dd41d360ea
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
2012-01-18 12:33:45 -08:00
Eric Laurent
71c4496a97
AudioFlinger: mix track only when really ready (2)
...
This problem due to the way audio buffers are mixed when
low power mode is active was addressed by commits 19ddf0eb
and 8a04fe03 but only partially. As a matter of fact, when more
than one audio track is playing, the problem is still present.
This is most noticeable when playing music with screen off
and a notification or navigation instruction is played: in this case,
the music or notification is likely to skip.
The fix consists in declaring the mixer ready if all active tracks
are ready. Previous behavior was to declare ready if at least one track was
ready. To avoid that one application failing to fill the track buffer blocks other
tracks indefinitely, this condition is respected only if the mixer was ready
in the previous round.
Issue 5799167.
Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
2012-01-18 12:27:38 -08:00
Robert Ly
dc6720f34b
docs: adding rs api docs
...
Change-Id: Ib56ee177439e9c124d0ac4053ed4173f8a4be1aa
2012-01-17 16:14:44 -08:00
Adam Powell
c8fcde2b6b
Fix DeviceDefault theme/style bugs where parent styles were
...
incorrectly specified.
This affected search bars and alert dialogs spawned from activities
using Theme.DeviceDefault.Light as a base.
Change-Id: I219d38d486498db5b4b283560256afd7d6051535
2012-01-17 12:58:23 -08:00
Joe Fernandez
ed2c2095e4
docs: Android API 15 SDK r2 Release Notes
...
Change-Id: Ifadc7c464ea624a2e989e9050f2acc1e0d4d1c2c
2012-01-17 12:53:58 -08:00
Wink Saville
1e6329d454
Use new preferredAPN URI avoiding onApnChanged() call with self-change
...
Solving the issue that setting preferred APN from GDCT triggers
back APN change event and force unnecessary data call disconnects
and setups.
The new URI is added in Telephony Provider so ContentObserver
callback (results in onApnChanged) will not be triggered.
Bug:5448858
Change-Id: I4c0bcf32cec69cf1d0a0430f7a27495b89e93625
2012-01-17 11:31:54 -08:00
Scott Main
2afcd2d1a2
am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
...
* commit '3938e4fbaae132db9b4676ba26f6b3c042a6879e':
docs: emphasize qualifier order and mention implicit version qualifer
2012-01-13 18:25:44 -08:00
Scott Main
3938e4fbaa
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
2012-01-13 18:23:40 -08:00
Scott Main
114875e837
am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
...
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
2012-01-13 18:23:35 -08:00
Dianne Hackborn
d4d68fe202
am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
...
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
2012-01-13 18:23:34 -08:00
Daniel Sandler
80c4cd1fd7
am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
...
* commit 'bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
2012-01-13 18:23:33 -08:00
Scott Main
40d6e7d913
Merge "docs: mention x86 as a native platform filter" into ics-mr1
2012-01-13 18:21:42 -08:00
Scott Main
e2225df259
docs: mention x86 as a native platform filter
...
Change-Id: I003b1e0e649f36e8971df85ef2a28f991875d605
2012-01-13 18:20:10 -08:00
Dianne Hackborn
cc7bd5ab55
Merge "Update notification documentation to follow current guidelines." into ics-mr1
2012-01-13 16:36:05 -08:00
Daniel Sandler
bd9d9d3ae2
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
...
Change-Id: I8910c0982ffe2be482f6ae1a49343a1c79be0632
2012-01-13 15:12:07 -08:00
Kenny Root
e80341c8c5
am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
...
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
2012-01-13 13:12:34 -08:00
Kenny Root
2ddf6ea6dc
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
2012-01-13 13:11:02 -08:00
Dianne Hackborn
100651779f
am 2e282f35: Merge "Fix issue #5823276 : home repaints after full-screen app is exited" into ics-mr1
...
* commit '2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #5823276 : home repaints after full-screen app is exited
2012-01-13 12:58:45 -08:00
Dianne Hackborn
2e282f35b0
Merge "Fix issue #5823276 : home repaints after full-screen app is exited" into ics-mr1
2012-01-13 12:56:40 -08:00
Bart Sears
bcce2a1953
am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
...
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
2012-01-13 12:35:07 -08:00
Bart Sears
da7b7700d0
Merge "Update to latest version of Roboto" into ics-mr1
2012-01-13 12:32:43 -08:00
Christopher Tate
89620c5d98
am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
...
* commit '2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
2012-01-13 12:08:09 -08:00
Christopher Tate
2cf18d2878
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
2012-01-13 11:49:20 -08:00
Bart Sears
6c16a58b2c
Update to latest version of Roboto
...
Bug: 5527891
U+0125 (h with Circumflex): Moved the Circumflex to not stick out
beyond the left edge of the "h"
U+0300, U+0301, U+0303, U+0309, U+030F, U+0323: Move to the left so
that they can be composited.
U+047C (Capital Omega with Titlo): Fixed the Titlo accent
U+047D (Small Omega with Titlo): Fixed the Titlo accent
U+048E (Capital ER with tick): Changed the tick to be diagonal
U+2248 (Almost equal to): Added the glyph
Change-Id: Ibcadcd008a58f42d8bd4238d768101d8bf726ff6
2012-01-13 11:44:23 -08:00
John Huang
e65723044d
am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
...
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
2012-01-13 11:39:03 -08:00
John Huang
2753e826b2
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
2012-01-13 11:37:15 -08:00
Jean-Baptiste Queru
c0ef548c74
am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:25:09 -08:00
Jean-Baptiste Queru
d75961eecb
am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
...
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
2012-01-13 11:22:08 -08:00
Scott Main
be0cf70dc3
docs: emphasize qualifier order and mention implicit version qualifer
...
Change-Id: I6e1d174a27ccbdc5179bd3d06de0a69c17a5cfcc
2012-01-13 11:19:05 -08:00
Robert Ly
7da0abc52e
am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
...
* commit '62472581c30a3202b7bbd86e644b4346d5a4e65c':
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
2012-01-13 11:09:27 -08:00
Robert Ly
2eeb53c155
update overview page for rs api docs to open iframe links in parent
...
Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
2012-01-13 10:18:43 -08:00
Robert Ly
62472581c3
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
2012-01-13 10:13:14 -08:00
Robert Ly
0272f1dfd7
cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
...
Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
2012-01-13 10:07:20 -08:00
Jean-Baptiste Queru
b4cee0f871
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
2012-01-13 07:48:56 -08:00
Robert Greenwalt
2fceb7fec0
Fix teardown of secondary connections on CDMA
...
Restores functionallity from Gingerbread. We should tear down when the
enabledcount goes to zero, but we should always notify and attempt to
switch back to default when indicated.
bug:5830081
Change-Id: Ib8469bb5369da21e8cc05fb755b2d7e24c8e02a6
2012-01-12 17:38:54 -08:00
Christopher Tate
0bacfd2ba6
Streamline package-installed handling by the Backup Manager
...
In particular, don't do O(asec_apps * installed_apps) work during the
broadcast receiver's operation. On devices with many installed apps
and a large number of them moved to ASECs, this was causing the system
process to become unresponsive and the watchdog to fire -- which in turn
would initiate a restart loop, as the same package-installed broadcast
would then be issued again once the package manager rescanned the ASEC
containers, ad infinitum. With this change, the expensive call to the
package manager is only made once rather than asec_apps times.
Bug 5850283
Change-Id: I14e280ea1fa6af19cebc58869a20fbb599c92c8c
2012-01-12 16:15:09 -08:00
Dianne Hackborn
6ceca588a2
Update notification documentation to follow current guidelines.
...
The documentation is now consistent with the current UI guidelines
for handling notifications, and includes complete sample code showing
the correct way to do this.
Change-Id: I68f0afc62c2af164c3205535e62093679e2a256a
2012-01-12 15:48:20 -08:00
Scott Main
cea3892bd7
am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1
...
* commit '722c8c02f1e17c232b041440ea97a2fda336a6e8':
docs: make AD logo clickable on home page
2012-01-12 15:47:15 -08:00
Scott Main
722c8c02f1
Merge "docs: make AD logo clickable on home page" into ics-mr1
2012-01-12 15:44:53 -08:00