Irfan Sheriff
9c3e293f92
am 651cdfcb: Unhide wifi p2p API
...
* commit '651cdfcbac6245f570475991588ddc2d30265e8d':
Unhide wifi p2p API
2011-09-13 16:09:14 -07:00
Irfan Sheriff
651cdfcbac
Unhide wifi p2p API
...
Bug: 5247957
Change-Id: Id93e30c0cb60f361ba13a840de8f843415777336
2011-09-13 16:04:00 -07:00
Mike Lockwood
382087829a
Merge "ActivityManagerService: Disable app crashed dialog on headless builds" into ics-aah
2011-09-13 14:23:32 -07:00
Mike Lockwood
1acfc1d48a
ActivityManagerService: Disable app crashed dialog on headless builds
...
Change-Id: Ife4bd7ea2d660feb4d630be2ca63e0403e953dde
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 17:21:46 -04:00
Dianne Hackborn
cda44ab452
am 3368a99f: Merge "Fix issue #4280324 : Returning to Fullscreen Layout with WebView..."
...
* commit '3368a99f3cc362d2d823f06a9b1e216696c41ea6':
Fix issue #4280324 : Returning to Fullscreen Layout with WebView...
2011-09-13 14:18:56 -07:00
Dianne Hackborn
3368a99f3c
Merge "Fix issue #4280324 : Returning to Fullscreen Layout with WebView..."
2011-09-13 14:16:59 -07:00
Mike Lockwood
5010bbda0f
Merge "Fix problems dispatching media button events on headless devices" into ics-aah
2011-09-13 13:32:14 -07:00
Mike Lockwood
1d29e2129f
Fix problems dispatching media button events on headless devices
...
Change-Id: Ib0f8ca008c7e1325d5dc6f6534f08960c527eeac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-13 16:29:38 -04:00
Dianne Hackborn
f809870f11
Fix issue #4280324 : Returning to Fullscreen Layout with WebView...
...
...Leads to Shifted Layout
Change-Id: I6cf3fd0dd066f73cd1ec6fce3d994f7e3eead293
2011-09-13 13:26:38 -07:00
Eric Laurent
35bc00d36d
am 1fbe7a8e: Merge "Issue 4345021: Audio routed to multiple devices..."
...
* commit '1fbe7a8e828fd0fe8339d075da08aad701ab6e98':
Issue 4345021: Audio routed to multiple devices...
2011-09-13 12:59:45 -07:00
Eric Laurent
1fbe7a8e82
Merge "Issue 4345021: Audio routed to multiple devices..."
2011-09-13 12:57:37 -07:00
Eric Laurent
5f37be324f
Issue 4345021: Audio routed to multiple devices...
...
There is a possiblility that the condition on which RecordThread::checkForNewParameters_l()
waits after updating the command completion status is never signalled.
This happens if the thread executing ThreadBase::setParameters() has timed out waiting
for the status (for instance if the audio HAL takes too long to execute the setParameters()
command. Then the RecordThread is stuck forever.
The fix consists in waiting for the condition with a timeout in RecordThread::checkForNewParameters_l().
Change-Id: I7fc671bc2fc43ba4acb65a2beb33ee05742f091e
2011-09-13 12:44:22 -07:00
Mathias Agopian
513d15aeef
am 62bb0cdc: Merge "improve sensorservice_test output"
...
* commit '62bb0cdc746e850c2d2d5da4f6c7a38f8782f4bc':
improve sensorservice_test output
2011-09-12 22:18:48 -07:00
Mathias Agopian
8c2733527a
improve sensorservice_test output
...
Change-Id: I6248b6f1f001fedec1bddcddfcd2b381d9bb4bf4
2011-09-12 22:16:01 -07:00
Jeff Sharkey
e4c7ed4292
am e44365b5: Merge "Data usage structure optimizations."
...
* commit 'e44365b539056b84a3ab57f5a9338d182eb10033':
Data usage structure optimizations.
2011-09-12 16:53:50 -07:00
Jeff Sharkey
e44365b539
Merge "Data usage structure optimizations."
2011-09-12 16:50:34 -07:00
Jeff Sharkey
69b0f63af2
Data usage structure optimizations.
...
Driven by traceview hotspots found in Settings UI.
Change-Id: I614a049523c526b7fcd12fffdf53a3e4723623e4
2011-09-12 16:13:20 -07:00
Dianne Hackborn
b73f3175a7
am 83f9dfe0: Merge "Add boot mode where only "core apps" are started."
...
* commit '83f9dfe0f085a01ebaa9f3ba6205af20e20bbe78':
Add boot mode where only "core apps" are started.
2011-09-12 15:09:14 -07:00
Dianne Hackborn
83f9dfe0f0
Merge "Add boot mode where only "core apps" are started."
2011-09-12 15:07:51 -07:00
Dianne Hackborn
4c34eed9ab
am 1cd955b0: Merge "Get rid of some animation flickers and other bad things."
...
* commit '1cd955b01d8ea72009be56f4c4a93d4d79e902df':
Get rid of some animation flickers and other bad things.
2011-09-12 14:44:11 -07:00
Dianne Hackborn
1cd955b01d
Merge "Get rid of some animation flickers and other bad things."
2011-09-12 14:42:02 -07:00
Christopher Tate
9bbddd22c3
am d30b8979: Merge "Move full backup/restore onto dedicated threads"
...
* commit 'd30b89799c010ad91b9d98fb0c3ddb45b152f71e':
Move full backup/restore onto dedicated threads
2011-09-12 14:21:18 -07:00
Christopher Tate
d30b89799c
Merge "Move full backup/restore onto dedicated threads"
2011-09-12 14:19:15 -07:00
Dianne Hackborn
d02a9e95f4
Get rid of some animation flickers and other bad things.
...
Change-Id: If7606286bf0bd01cf023d57719ccb27e39d5564c
2011-09-12 13:47:31 -07:00
Christopher Tate
a28e854683
Move full backup/restore onto dedicated threads
...
Running full backup/restore on the Backup Manager looper thread causes problems.
It not only interfered with the delayed-Message timeout processing; in the case
of installing apks during restore it also interfered fatally with the interaction
between the Package Manager and install-time restore of data from the cloud.
The long-term right thing to do here will be a refactoring of full backup and
restore to be structured as the sort of state-machine process that incremental
backup and restore now use. This is particularly thorny in the case of full
restore (due to the Package Manager interactions), and full backup/restore are
considered experimental at this point, so that refactoring is deferred to a
future release. The current process is essentially standalone, so the bug is
fixed here pro tem by letting it run to completion on its own thread, freeing
the looper for normal work.
Fixes bug 5173450
Change-Id: I659a61afa18ffe7fde1a07f7fa0e860d5e8d5a89
2011-09-12 13:45:21 -07:00
Dianne Hackborn
d2509fd835
Add boot mode where only "core apps" are started.
...
A core app is one that has coreApp="true" in its manifest tag.
The system can successfully boot (though a little painfully) with
only framework-res.apk, SettingsProvider.apk, SystemUI.apk,
DefaultContainerService.apk, and Launcher2.apk set as core apps.
Currently this boot mode is always turned off.
Change-Id: Ieaa4a8031c2c391a12996aa8d8b1d65fc2b09d6b
2011-09-12 12:29:43 -07:00
Irfan Sheriff
e53230f1ec
am 45caa447: Merge "Emergency callback mode handling"
...
* commit '45caa44717d047e0aa0a066c352eee00a6ea2f11':
Emergency callback mode handling
2011-09-12 12:25:58 -07:00
Irfan Sheriff
45caa44717
Merge "Emergency callback mode handling"
2011-09-12 12:24:05 -07:00
satok
ad05f6be86
am d2deee1e: Merge "Fix the visiblity of the ime switcher icon."
...
* commit 'd2deee1eeb4de93b2d5158dcfc79b1bb68accf79':
Fix the visiblity of the ime switcher icon.
2011-09-12 00:28:35 -07:00
satok
9747f8977c
Fix the visiblity of the ime switcher icon.
...
Bug: 5288866
Change-Id: I99b4aee36c337b2fab1116e9245ddecd826c840c
2011-09-12 15:56:40 +09:00
Irfan Sheriff
616f3173e0
Emergency callback mode handling
...
For wifi, track ECM and shut down and restart when device
goes in ECM and out
For p2p, simply turn off when in ECM mode
Bug: 5185246
Change-Id: I5f5bf75fac3e27db1d7c412135c796f2b137263d
2011-09-11 22:56:17 -07:00
Ben Komalo
4b2efcb26f
am 6c048260: Merge "Revert encryption mapping for device wipes."
...
* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
Revert encryption mapping for device wipes.
2011-09-11 16:53:00 -07:00
Ben Komalo
6c048260f3
Merge "Revert encryption mapping for device wipes."
2011-09-11 16:48:32 -07:00
Dianne Hackborn
54869071db
am fe75cb34: Merge "Fix inflating of animations."
...
* commit 'fe75cb342e33e7c465709bb34ab7abae9e9871f6':
Fix inflating of animations.
2011-09-11 13:09:40 -07:00
Dianne Hackborn
8962028b6e
Fix inflating of animations.
...
Need to define attributes for animation set, to have correct indices.
Also small fixes elsewhere.
Change-Id: If596147e8aee4ebffe4e184872070341eff6df73
2011-09-11 12:47:45 -07:00
Dianne Hackborn
2ac2a7c61c
am e123612c: Merge "Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens"
...
* commit 'e123612c08719352d3313005d0b792f17bbe090d':
Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens
2011-09-09 14:55:13 -07:00
Dianne Hackborn
e123612c08
Merge "Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens"
2011-09-09 14:53:53 -07:00
Dianne Hackborn
e5ba16a7af
Work on issue #5144065 : Tap on Music icon from Home screen - a different app opens
...
When force stopping an app, when removing its activities also finish any
activities from other apps above it in the task. This avoids some situations
where the task gets into a bad state where its root becomes a different app.
Change-Id: I79e5cd520ae321bec80adefd2ccc2b0370ace372
2011-09-09 14:48:13 -07:00
Ben Komalo
13c7197da8
Revert encryption mapping for device wipes.
...
External storage volumes that were emulated+encrypted needed to have
their encryption mapping removed so that it doesn't try to encrypt the
volume after formatting them.
This just wires through an argument through vold, and assumes that vold
will do the right thing even if there is no encryption mapping set.
Bug: 5017638
Change-Id: I858fae3d12cb415bc34637f520f71220ad9daaad
2011-09-09 14:44:40 -07:00
Jeff Brown
deb5882b2e
am 1d50a2c0: Merge "Adjust layers for system overlays."
...
* commit '1d50a2c0682926f783f9acab5c4bdeca1d3cb9cd':
Adjust layers for system overlays.
2011-09-09 11:08:21 -07:00
Jeff Brown
1d50a2c068
Merge "Adjust layers for system overlays."
2011-09-09 11:06:25 -07:00
Mathias Agopian
42ec1f0327
am 94d86dae: Merge "Fix another problem with refreshing the screen when switching to/from overlay"
...
* commit '94d86daeb55ad36ec2e4371ca62646b89b4a2a47':
Fix another problem with refreshing the screen when switching to/from overlay
2011-09-09 09:07:10 -07:00
Mathias Agopian
8fcb4df11f
am 28706e3f: Merge "Improve SF dumpsys output wrt HWC"
...
* commit '28706e3fbddf89136e2f1b9c4ad7bea85eee328e':
Improve SF dumpsys output wrt HWC
2011-09-09 09:07:06 -07:00
Mathias Agopian
e1de2531e7
am 6b77231b: Merge "Fix an issue is SF that caused drawing artifacts when hwc changed mode"
...
* commit '6b77231bccc3efcb744fc5b2df0619b2b4690771':
Fix an issue is SF that caused drawing artifacts when hwc changed mode
2011-09-09 09:06:27 -07:00
JP Abgrall
571a514153
am 40e8b411: Merge "NetworkManagementService: adjust the qtaguid idx to new kernel"
...
* commit '40e8b4118fb03a0499b4383ff0d6d582b6d1cf64':
NetworkManagementService: adjust the qtaguid idx to new kernel
2011-09-09 09:05:31 -07:00
Eric Laurent
e61417a95d
am 1a4cbba9: Merge "Fixed digital audio output detection"
...
* commit '1a4cbba932bc5da29a8933ddf8d6fe8d5a0826b8':
Fixed digital audio output detection
2011-09-09 09:04:35 -07:00
Robert Greenwalt
b3e26eb241
am 4ef6d2ea: Merge "Pass roaming info to ConnectivityService."
...
* commit '4ef6d2ea215169c2c0cbab14228e5073e986392b':
Pass roaming info to ConnectivityService.
2011-09-09 09:03:03 -07:00
Svetoslav Ganov
6a587dffa1
am 53df60b8: Merge "Touch explorer does not cancel long press correctly causing system crash."
...
* commit '53df60b81eac34445389ae05a6b664077d27cbd7':
Touch explorer does not cancel long press correctly causing system crash.
2011-09-09 09:01:57 -07:00
Jeff Sharkey
332ea4db33
am b0d89922: Merge "Always disable() through SBMS; watch date."
...
* commit 'b0d89922b186b62701aa7ee1ed8f808fac2c1d9b':
Always disable() through SBMS; watch date.
2011-09-09 09:01:46 -07:00
Mathias Agopian
0a5abdb316
Fix another problem with refreshing the screen when switching to/from overlay
...
the previous fix was incorrect. See comment in setupHardwareComposer for
full explanations.
Change-Id: Ib24a9af000b8f95cf7319f9272d34997064ceb6d
2011-09-09 01:47:48 -07:00