Christopher Tate
65d8ec0dd3
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:17:22 -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
John Huang
29f2cd91d7
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:08 -08:00
John Huang
2753e826b2
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
2012-01-13 11:37:15 -08:00
Robert Ly
c9508b020d
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:10:37 -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
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
Scott Main
8f15ec1fce
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:46:46 -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
Scott Main
8b56d20e30
docs: make AD logo clickable on home page
...
Change-Id: Ib8a94280d4183b82bcbc5969f2dff1a67c1ecc53
2012-01-12 15:33:38 -08:00
John Grossman
881186c322
Enhance Visualizer behavior in the case of mediaserver death.
...
Bring the Visualizer class into line with the SDK documentation by
returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when
the Visualizer loses its binder connection to the mediaserver because
of a mediaserver restart.
Also add a new callback interface to allow clients to be
asynchronously notified in the case of server death. Right now, the
interface definition and the registration method are flagged as hidden
pending API council review/approval.
See http://b/issue?id=5717519 for details.
Change-Id: Id428fb946d6d7676bffd2a597366e8444ebe24f2
Signed-off-by: John Grossman <johngro@google.com>
2012-01-12 14:36:16 -08:00
John Grossman
8c67e67c33
Merge "Reuse callback buffers in the Visualizer." into ics-aah
2012-01-12 14:31:51 -08:00
Chia-chi Yeh
3e0c856e4a
am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
...
* commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b':
VPN: silence VPN notifications.
2012-01-12 14:26:49 -08:00
Chia-chi Yeh
ff321d496a
Merge "VPN: silence VPN notifications." into ics-mr1
2012-01-12 14:24:30 -08:00
Roman Nurik
b533f46228
am aaaafca8: docs: Android design CSS/JS fixes
...
* commit 'aaaafca8543eaa75f1865d70c801c9b62caa56e2':
docs: Android design CSS/JS fixes
2012-01-12 14:07:53 -08:00
Roman Nurik
aaaafca854
docs: Android design CSS/JS fixes
...
- Remove new window icon for Developer site link
- Make videos re-load and replay on click to prevent
failed replay for unseekable videos
Change-Id: I689607d0d53247b0e599612cb7d23a98d6ad24a1
2012-01-12 13:57:44 -08:00
Roman Nurik
a24c8bf255
am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
...
* commit 'baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
docs: minor Design Principles fixes for Android Design
2012-01-12 12:46:53 -08:00
Roman Nurik
baa88ef7d3
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
2012-01-12 12:45:00 -08:00
Jim Miller
b4c7ec56d6
am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
...
* commit '7a286d8391a58637e6834f4de296bf66183ce1b2':
Fix 5620754: don't show pattern screen after SIM PUK unlock
2012-01-12 12:31:09 -08:00
Jim Miller
7a286d8391
Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
2012-01-12 12:28:59 -08:00
Roman Nurik
403cb28a81
docs: minor Design Principles fixes for Android Design
...
Change-Id: I3d69c5fd420e7e6a7d70ebf4a65179af23a70859
2012-01-12 12:08:07 -08:00
John Grossman
595d76ee82
Reuse callback buffers in the Visualizer.
...
Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash. Instead, lazily allocate the buffers and only
reallocate them when the required size changes.
See http://b/issue?id=5717519 for details.
Change-Id: I50458961992a64d9b3c46db7e5e8e6414a92228f
Signed-off-by: John Grossman <johngro@google.com>
2012-01-12 11:52:39 -08:00
Daniel Sandler
338618e7ad
am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
...
* commit '755a967bdc2cddb6fbadd10e357f8a5328520061':
Clean up wifi/mobile indicators in the expanded panel.
2012-01-12 11:40:36 -08:00
Daniel Sandler
755a967bdc
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
2012-01-12 11:38:39 -08:00
Scott Main
cf89dcb321
am cf602dbd: docs: replace "decide for me image" bug: 5860467
...
* commit 'cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
docs: replace "decide for me image" bug: 5860467
2012-01-12 11:37:46 -08:00
Scott Main
cf602dbd0b
docs: replace "decide for me image"
...
bug: 5860467
Change-Id: I45f10df561c9392dc5b4621305413d1e7621e05d
2012-01-12 11:30:27 -08:00
Matthew Xie
1b94af5f45
am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
...
* commit '79d84930cd776c7173330eeb13b3282b6034fc37':
Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
2012-01-12 11:27:01 -08:00
Scott Main
ebb7f5664b
am a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
...
* commit 'a618eeb552981d8bca38dbe8c28e2b1b1bffdf5e':
docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519
2012-01-12 11:24:20 -08:00
Matthew Xie
79d84930cd
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
2012-01-12 11:24:06 -08:00
Scott Main
a618eeb552
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
2012-01-12 11:22:24 -08:00
Scott Main
7cb3c5b664
am abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
...
* commit 'abfe4cb6f0ebd6c901d3210fed719d03db9e80b7':
docs: further clarify the behavior of targetSdkVersion bug: 5854083
2012-01-12 11:20:56 -08:00
Scott Main
abfe4cb6f0
Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
2012-01-12 11:19:08 -08:00
Scott Main
0c95bb478e
docs: update text and image for "let me make it mine" prinicple in design guide
...
bug: 5853519
Change-Id: I7cccbb6d6eb94f29cbad24d3a07c9222a963434c
2012-01-12 11:16:35 -08:00
Robert Greenwalt
c60a627c00
am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
...
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
Disable wimax when mobile data is in Settings
2012-01-12 09:26:33 -08:00
Robert Greenwalt
4b1261f17a
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
2012-01-12 09:24:45 -08:00
Danielle Millett
d712248e4e
am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
...
* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
DO NOT MERGE - Cherry picking from master to MR1
2012-01-12 07:31:36 -08:00
Danielle Millett
2931d8ace9
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
2012-01-12 07:28:24 -08:00
Brian Colonna
79b499005f
am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
...
* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99':
DO NOT MERGE cherry-picked FU framework tablet commits
2012-01-12 06:36:02 -08:00
Brian Colonna
8a1131d789
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
2012-01-12 06:33:49 -08:00
Xia Wang
b1e65faf13
am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
...
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
2012-01-11 17:54:25 -08:00
Xia Wang
19bdbca0bb
am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
...
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
Get average value for image processing test bug#: 5566079
2012-01-11 17:54:18 -08:00
Xia Wang
4ac4ab4ef0
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
2012-01-11 17:52:06 -08:00
Xia Wang
1446c7b2ed
Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
2012-01-11 17:51:48 -08:00
Scott Main
d4eb682b5f
docs: further clarify the behavior of targetSdkVersion
...
bug: 5854083
Change-Id: I913a245b754604165b4570447f797f7cc66af5f9
2012-01-11 17:23:06 -08:00
Katie McCormick
4f7014d738
am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
...
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
Doc change: Adding Bluetooth HDP info.
2012-01-11 16:42:44 -08:00
Katie McCormick
6a52c63253
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
2012-01-11 16:40:37 -08:00
Katie McCormick
2e32a78ead
Doc change: Adding Bluetooth HDP info.
...
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
2012-01-11 16:18:50 -08:00
John Wang
8f4de37a38
am 6ad68ba9: Adjust the mapping of LTE signal bars.
...
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
Adjust the mapping of LTE signal bars.
2012-01-11 15:36:07 -08:00