OSDN Git Service
Android (Google) Code Review [Thu, 3 Dec 2009 18:24:18 +0000 (10:24 -0800)]
Merge change Id5fa58cf into eclair
* changes:
Fix timezone issue to comply with EXIF standard.
Daniel Sandler [Wed, 2 Dec 2009 21:15:37 +0000 (16:15 -0500)]
Fix lock screen layouts with emergency call buttons.
Fixes http://b/
2259529
Partially fixes http://b/
2260798
Change-Id: Iabb3f74dc2a331810ae8ff44ebb319fe25d217ef
Wu-cheng Li [Wed, 2 Dec 2009 10:57:29 +0000 (18:57 +0800)]
Document that stopPreview is not needed before takePicture.
Also, applications can call startPreview after jpeg callback is received.
http://b/
2292461
Joe Onorato [Thu, 3 Dec 2009 07:26:27 +0000 (23:26 -0800)]
Make the notification panel send the position as well.
Joe Onorato [Thu, 3 Dec 2009 07:04:55 +0000 (23:04 -0800)]
Make RemoteViews also set the sourceBounds in the PendingIntent.
Joe Onorato [Thu, 3 Dec 2009 05:13:17 +0000 (21:13 -0800)]
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
be sent.
Android (Google) Code Review [Thu, 3 Dec 2009 05:01:20 +0000 (21:01 -0800)]
Merge change Ica5efffe into eclair
* changes:
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Jack Veenstra [Thu, 3 Dec 2009 04:14:50 +0000 (20:14 -0800)]
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Android (Google) Code Review [Thu, 3 Dec 2009 02:51:19 +0000 (18:51 -0800)]
Merge change I7b9328c7 into eclair
* changes:
Fix issue #
2300232: Bugs in resolving conflicting pointers
Dianne Hackborn [Thu, 3 Dec 2009 02:42:39 +0000 (18:42 -0800)]
Fix issue #
2300232: Bugs in resolving conflicting pointers
Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
Android (Google) Code Review [Thu, 3 Dec 2009 02:21:49 +0000 (18:21 -0800)]
Merge change Iaa6e73a6 into eclair
* changes:
Revive backup tests
Omari Stephens [Thu, 3 Dec 2009 01:39:27 +0000 (17:39 -0800)]
Revive backup tests
Android (Google) Code Review [Thu, 3 Dec 2009 01:09:46 +0000 (17:09 -0800)]
Merge change Id86beb99 into eclair
* changes:
fix [
2291418] Camera preview cannot work in Emulator
Android (Google) Code Review [Thu, 3 Dec 2009 00:24:15 +0000 (16:24 -0800)]
Merge change Icc49422a into eclair
* changes:
Implement new notification LED blinking logic:
Mathias Agopian [Thu, 3 Dec 2009 00:23:11 +0000 (16:23 -0800)]
fix [
2291418] Camera preview cannot work in Emulator
The image buffer used by glTexImage2d() would be uninitialized when no copybit engine
can be found.
We now always initialize images, since the abscence of copybit is not necessarily fatal.
Android (Google) Code Review [Thu, 3 Dec 2009 00:17:54 +0000 (16:17 -0800)]
Merge change If1f0bf33 into eclair
* changes:
Some work on issue #
2286804: sometimes text field doesn't accept input
Android (Google) Code Review [Thu, 3 Dec 2009 00:02:58 +0000 (16:02 -0800)]
Merge change I721361f1 into eclair
* changes:
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Android (Google) Code Review [Wed, 2 Dec 2009 23:40:17 +0000 (15:40 -0800)]
Merge change I9fb53a9c into eclair
* changes:
add screenshots for the Bluetooth Chat sample app
Jaikumar Ganesh [Fri, 20 Nov 2009 23:21:47 +0000 (15:21 -0800)]
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
1. PRIORITY_OFF is when user unchecks A2DP connection profile box.
2. By default, when you bond, it will be PRIORITY_ON.
3. When the profile gets connected, the priority gets set to
PRIORITY_AUTO_CONNECT. This means that we will connect
automatically to this profile.
4. When the user disconnects, we downgrade the priority to PRIORITY_ON,
which means we won't reconnect automatically.
a) We need to make a similar change to Handsfree profile.
b) We need to rework the profile management design and code which
will fix the 6 second timer that we have for A2DP reconnection.
Add AUTO_CONNECT priority for Headset profile.
Also, don't set priority to ON while disconnecting.
This logic has been pushed up to the Settings app.
Dr No: Eastham
Bug:
2133530
Dianne Hackborn [Wed, 2 Dec 2009 21:47:25 +0000 (13:47 -0800)]
Some work on issue #
2286804: sometimes text field doesn't accept input
This doesn't really fix the problem being brought up here, but fixes a
related issue I found while investigating it -- if you tap a text view
enough to cause it to try to scroll, this will cause the touch to become
a scroll instead of a click, even if there is nothing to scroll. So
often quick taps to bring up the IME would be canceled because they
became a non-scroll.
Unfortuntately after syncing the latest build, I was having a lot of
trouble reproducing the original problem. I think I need to punt it to
MR2 at this point.
Change-Id: If1f0bf33de1b4d71c9f677cdad07639b7a3fb772
Scott Main [Wed, 2 Dec 2009 23:08:19 +0000 (15:08 -0800)]
add screenshots for the Bluetooth Chat sample app
Android (Google) Code Review [Wed, 2 Dec 2009 23:01:35 +0000 (15:01 -0800)]
Merge change Id0704505 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:53:54 +0000 (14:53 -0800)]
Import revised translations. DO NOT MERGE
Mike Lockwood [Wed, 2 Dec 2009 16:15:02 +0000 (11:15 -0500)]
Implement new notification LED blinking logic:
1) Do not pulse notification LED when screen is on.
2) Pulse once on new notification if Settings.System.NOTIFICATION_LIGHT_PULSE is false,
otherwise pulse persistently while screen is off.
Fixes part of bug b/
2238250 (trackball should pulse occasionally to indicate new email)
Change-Id: Icc49422a4e9d14412fc159a8e2596503a85bac51
Signed-off-by: Mike Lockwood <lockwood@android.com>
Wink Saville [Wed, 2 Dec 2009 17:46:38 +0000 (09:46 -0800)]
Cleanup @hide and @deprecated directives.
Bug:
2294396
Change-Id: Icb34706a203fb34e52c67b904328e91a7803d4fc
Android (Google) Code Review [Wed, 2 Dec 2009 16:35:55 +0000 (08:35 -0800)]
Merge change Iae3ed706 into eclair
* changes:
Add new setting for notification light pulsing. Bug #
2238250
Android (Google) Code Review [Wed, 2 Dec 2009 06:41:22 +0000 (22:41 -0800)]
Merge change Ic8231560 into eclair
* changes:
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Android (Google) Code Review [Wed, 2 Dec 2009 06:39:33 +0000 (22:39 -0800)]
Merge change Iac196e17 into eclair
* changes:
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Dirk Dougherty [Wed, 2 Dec 2009 00:45:14 +0000 (16:45 -0800)]
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Bug:
2160782
Change-Id: Ic8231560ef1bc036cfd5d242c65f654cb110fc6b
Amith Yamasani [Wed, 2 Dec 2009 03:02:05 +0000 (19:02 -0800)]
Add new setting for notification light pulsing. Bug #
2238250
New System setting and code to set the defaults on upgrade.
Android (Google) Code Review [Wed, 2 Dec 2009 02:01:25 +0000 (18:01 -0800)]
Merge change I0e44976a into eclair
* changes:
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Mathias Agopian [Wed, 2 Dec 2009 01:23:28 +0000 (17:23 -0800)]
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
There was bug in the logic that calculated the relative timeout, the start time was
reset each time an event was received, which caused the timeout to never occur if
an application was constantly redrawing.
Now we always check for a timeout when we come back from the waitEvent() and
process the "anti-freeze" if needed, regardless of whether an event was received.
Android (Google) Code Review [Tue, 1 Dec 2009 23:57:50 +0000 (15:57 -0800)]
Merge change I0d8f7593 into eclair
* changes:
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Android (Google) Code Review [Tue, 1 Dec 2009 22:49:23 +0000 (14:49 -0800)]
Merge change I0b6ee9fc into eclair
* changes:
DATE_TAKEN should be in millisecond instead of second.
Dianne Hackborn [Tue, 1 Dec 2009 22:31:55 +0000 (14:31 -0800)]
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Change-Id: I0d8f75938226e1bb49cf7b1154445631b0bb0bc9
Leon Scroggins [Tue, 1 Dec 2009 19:42:55 +0000 (14:42 -0500)]
DO NOT MERGE.
Fix for http://b/issue?id=
2292512
When pressing the trackball on a WebTextView, open the IME.
Change-Id: I5ea74ca7ce51ac509dc8649b8f8d1869287bb7a9
Eric Laurent [Tue, 1 Dec 2009 10:17:41 +0000 (02:17 -0800)]
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
The problem comes from a deadlock with AudioPolicyService mutex: When the second ringtone starts,
this mutex is locked by AudioPolicyService::startOutput() which in turn calls setParameters() to change the output device.
Audioflinger::ThreadBase::setParameters() signals the parameter change to the AudioFlinger mixer thread and waits for a condition
indicating that the parameter change has been processed.
At the same time, the mixer thread detects that the audio track corresponding to the first ring tone has been killed and calls its destructor.
This calls AudioPolicyService::releaseOutput() which tries to lock the AudioPolicyService mutex.
If this happens before the mixer thread can process the setParameters() command we are deadlocked.
The deadlock ends because setParameters() uses a timeout when waiting for the condition.
This regression was introduced by change 33736 fixing issue
2265163.
The fix consists in calling AudioPolicyService::releaseOutput() from Track::destroy() instead of from Track destructor: as detroy() is never called from the mixer thread loop (as opposed to the destructor) the deadlock described above cannot occur.
Android (Google) Code Review [Tue, 1 Dec 2009 01:38:57 +0000 (17:38 -0800)]
Merge change I21a67b8d into eclair
* changes:
docs: remove droid-specific behavior change from platform notes
Android (Google) Code Review [Tue, 1 Dec 2009 01:00:43 +0000 (17:00 -0800)]
Merge change I5f24a240 into eclair
* changes:
Register Handsfree profile before headset profile. DO NOT MERGE.
Android (Google) Code Review [Tue, 1 Dec 2009 00:39:53 +0000 (16:39 -0800)]
Merge change I2b7c8a32 into eclair
* changes:
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Jaikumar Ganesh [Mon, 30 Nov 2009 22:17:30 +0000 (14:17 -0800)]
Register Handsfree profile before headset profile. DO NOT MERGE.
There is a delay between registering the two profiles,
and handsfree profile is a superset of the headset profile.
So some devices do an SDP and get the headset profile record
before we have registered the handsfree profile.
a) We can reject all incoming connections till all profiles are
registered, but then this would mean we connect later in some cases.
Registering profiles in this order seems fine to me.
Note: There is a also the need to fix forking sdptool to register
profiles, which would obliviate the need to wait 500 msecs between
profile registrations.
Bug:
2293792
Dr No: Eastham
Android (Google) Code Review [Tue, 1 Dec 2009 00:35:18 +0000 (16:35 -0800)]
Merge change I0e200c3c into eclair
* changes:
Sending UCS2 encoded SMS correctly
Scott Main [Tue, 1 Dec 2009 00:20:22 +0000 (16:20 -0800)]
docs: remove droid-specific behavior change from platform notes
bug:
2293281
Ray Chen [Mon, 30 Nov 2009 19:15:08 +0000 (11:15 -0800)]
Fix timezone issue to comply with EXIF standard.
Android (Google) Code Review [Mon, 30 Nov 2009 20:13:01 +0000 (12:13 -0800)]
Merge change I18ffb549 into eclair
* changes:
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Mathias Agopian [Mon, 30 Nov 2009 20:10:53 +0000 (12:10 -0800)]
fix [
2069023] STOPSHIP: disable DEBUG_COPYBIT
Android (Google) Code Review [Mon, 30 Nov 2009 19:55:10 +0000 (11:55 -0800)]
Merge change I5469a4ac into eclair
* changes:
fixed [
2260070] display stopped updating
Android (Google) Code Review [Mon, 30 Nov 2009 19:54:46 +0000 (11:54 -0800)]
Merge change Ie8493cf1 into eclair
* changes:
Import revised translations. DO NOT MERGE
Mike Lockwood [Mon, 30 Nov 2009 19:51:51 +0000 (14:51 -0500)]
Fix more of bug
2290852: Don't wake screen when bluetooth headset is connected or disconnected.
This fixes another case where the screen would turn on when the keyguard is open but hidden by another activity.
Change-Id: I2b7c8a329036401709e96ded4f4c138041192a71
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Fischer [Mon, 30 Nov 2009 19:33:16 +0000 (11:33 -0800)]
Import revised translations. DO NOT MERGE
Bai Tao [Wed, 25 Nov 2009 15:26:18 +0000 (23:26 +0800)]
Sending UCS2 encoded SMS correctly
http://b/
2285139
Mathias Agopian [Mon, 30 Nov 2009 19:15:41 +0000 (11:15 -0800)]
fixed [
2260070] display stopped updating
always check that the visible region isn't empty after all visible regions are recomputed
clear he freeze-lock if it is.
Ray Chen [Mon, 30 Nov 2009 19:07:47 +0000 (11:07 -0800)]
DATE_TAKEN should be in millisecond instead of second.
Android (Google) Code Review [Mon, 30 Nov 2009 18:00:06 +0000 (10:00 -0800)]
Merge change I524dc046 into eclair
* changes:
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Eric Laurent [Fri, 27 Nov 2009 13:07:55 +0000 (05:07 -0800)]
Fix issue
2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
Dima Zavin [Thu, 26 Nov 2009 07:31:48 +0000 (23:31 -0800)]
dumpstate: Pick up the last kernel log from /proc
This is needed since its no longer copied to /data/dontpanic by init.
Change-Id: I5217da73ec470653824b7fb9a31e093e263a8dc9
Signed-off-by: Dima Zavin <dima@android.com>
Android (Google) Code Review [Wed, 25 Nov 2009 21:52:08 +0000 (13:52 -0800)]
Merge change Ic9f6bf94 into eclair
* changes:
Add a test app that will drain the battery. NOT IN BUILD.
Joe Onorato [Wed, 25 Nov 2009 21:47:17 +0000 (16:47 -0500)]
Add a test app that will drain the battery. NOT IN BUILD.
Android (Google) Code Review [Wed, 25 Nov 2009 21:43:07 +0000 (13:43 -0800)]
Merge change I5aa3adcf into eclair
* changes:
Improve the exception message text by including eglGetError().
Android (Google) Code Review [Wed, 25 Nov 2009 20:55:44 +0000 (12:55 -0800)]
Merge change Ie552036f into eclair
* changes:
Fix issue #
2286419: maxSdkVersion causes existing apps to disappear.
Dianne Hackborn [Wed, 25 Nov 2009 20:41:15 +0000 (12:41 -0800)]
Fix issue #
2286419: maxSdkVersion causes existing apps to disappear.
Change-Id: Ie552036f4ea673e0ce9981ff1cbd1fbe08678510
Brett Chabot [Wed, 25 Nov 2009 19:32:12 +0000 (11:32 -0800)]
Add keyguard permission to instrumented ImfTest package.
Workaround to fix bug
2284623
Change-Id: I80afc37ed5ffae0447e0aedba686c13d682c8076
Android (Google) Code Review [Wed, 25 Nov 2009 10:37:27 +0000 (02:37 -0800)]
Merge changes I0c77eca9,Ibd184157,I81947f67 into eclair
* changes:
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Jack Palevich [Wed, 25 Nov 2009 05:56:21 +0000 (13:56 +0800)]
Improve the exception message text by including eglGetError().
Should help us track down the cause of bug
2285187
Android (Google) Code Review [Tue, 24 Nov 2009 23:41:32 +0000 (15:41 -0800)]
Merge change Ib71193bf into eclair
* changes:
Fix
2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Joe Onorato [Tue, 24 Nov 2009 23:34:42 +0000 (18:34 -0500)]
Fix
2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
In this case, as opposed to what was happening in
1977685, the focused view wasn't the one that was
directly removed, it was a child of the removed view.
Android (Google) Code Review [Tue, 24 Nov 2009 22:43:53 +0000 (14:43 -0800)]
Merge change I16925b91 into eclair
* changes:
Finish fixing issue #
2228381: android.view.InflateException...
Android (Google) Code Review [Tue, 24 Nov 2009 22:26:28 +0000 (14:26 -0800)]
Merge change Ibf0c320a into eclair
* changes:
When using MDP, we needed to use a texture for diming.
Android (Google) Code Review [Tue, 24 Nov 2009 22:00:54 +0000 (14:00 -0800)]
Merge change I6c6c166b into eclair
* changes:
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
Android (Google) Code Review [Tue, 24 Nov 2009 21:28:45 +0000 (13:28 -0800)]
Merge change I816428ae into eclair
* changes:
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number :
2177113
Swarna Kumar [Tue, 24 Nov 2009 19:02:37 +0000 (11:02 -0800)]
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Bug number :
2177113
Jason Sams [Tue, 24 Nov 2009 20:26:35 +0000 (12:26 -0800)]
Force a crash under conditions where white square bug in all apps is likely to occur.
Dianne Hackborn [Tue, 24 Nov 2009 19:26:00 +0000 (11:26 -0800)]
Finish fixing issue #
2228381: android.view.InflateException...
...Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
The problem was that we weren't dealing well with the situation where we start a transition
from activity A to B, then transition back to A before B is shown (it finishes before being
shown), then transition from A to C. At this point we had some state showing that we
were in the process of showing A from it being hidden (due to the middle transition from
B to A), which would cause the layout pass to ensure its window is hidden before the
transition starts.
The solution is to detect the case where we are showing a token and it is already actually
shown, and in this case not do all of the token setup for it to wait for its windows to
be displayed before it is shown. This isn't needed, the windows are already displayed
or the token is already set up to wait for them to be displayed.
Change-Id: I16925b91e1e2449dd65ade162a5758173c6e2695
Android (Google) Code Review [Tue, 24 Nov 2009 17:35:35 +0000 (09:35 -0800)]
Merge change Iefdb6f97 into eclair
* changes:
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Ben Murdoch [Thu, 19 Nov 2009 18:14:53 +0000 (18:14 +0000)]
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
BUG=b/
2271636
This has already been submitted to eclair-mr2.
Change-Id: I81947f671f58be006ee3e1b30d73c6cb6cf2ebee
Ben Murdoch [Thu, 19 Nov 2009 16:43:58 +0000 (16:43 +0000)]
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
This has already been submitted to eclair-mr2.
Change-Id: Ibd184157a90b0031141c91c3b3bbbf4ef86e44e4
Steve Block [Thu, 19 Nov 2009 12:29:47 +0000 (12:29 +0000)]
Improves documentation for GeolocationPermissions class. Do not merge.
Also sets an explicit type for GeolocationPermissions.getOrigins.
This is a partial fix for bug http://b/issue?id=
2271636
This has already been submitted to eclair-mr2.
Change-Id: I0c77eca94eb56d16c2a9a29a72eb221e4a7a52a6
Mathias Agopian [Tue, 24 Nov 2009 06:40:42 +0000 (22:40 -0800)]
When using MDP, we needed to use a texture for diming.
Dave Sparks [Tue, 24 Nov 2009 03:51:33 +0000 (19:51 -0800)]
Fix simulator build.
Jim Miller [Tue, 24 Nov 2009 02:21:51 +0000 (18:21 -0800)]
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
Android (Google) Code Review [Tue, 24 Nov 2009 01:58:24 +0000 (17:58 -0800)]
Merge change I0f9a53d4 into eclair
* changes:
Set metadata retriever thread group to the caller's group.
Android (Google) Code Review [Tue, 24 Nov 2009 01:42:41 +0000 (17:42 -0800)]
Merge change I2d32301b into eclair
* changes:
Add 4 new notification sounds.
Dave Sparks [Tue, 24 Nov 2009 01:23:35 +0000 (17:23 -0800)]
Add 4 new notification sounds.
Dave Sparks [Tue, 24 Nov 2009 00:51:15 +0000 (16:51 -0800)]
Set metadata retriever thread group to the caller's group.
This patch modifies the native binder interface to the metadata
retriever to pass the caller's thread group across the binder
interface. On the server side, the thread scheduler group is
set to the caller's scheduler group temporarily and restored
after the request has completed. This patch also reverts a
previous patch where the priority of the thread was forced to
a low priority foreground thread.
This should give apps more control over the priority of their
metadata retrieval, particularly allow background process to
run without hogging the CPU.
Android (Google) Code Review [Tue, 24 Nov 2009 00:14:13 +0000 (16:14 -0800)]
Merge change I36176536 into eclair
* changes:
Fix ref counting bug that could cause memory leak in allApps.
Dianne Hackborn [Mon, 23 Nov 2009 21:08:14 +0000 (13:08 -0800)]
Fix issue #
2281046: Size and pressure don't change
Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
Jason Sams [Mon, 23 Nov 2009 23:27:33 +0000 (15:27 -0800)]
Fix ref counting bug that could cause memory leak in allApps.
Dirk Dougherty [Thu, 19 Nov 2009 07:06:16 +0000 (23:06 -0800)]
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Bug:
2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
Android (Google) Code Review [Mon, 23 Nov 2009 21:20:46 +0000 (13:20 -0800)]
Merge change Ie7096ebb into eclair
* changes:
Add logging of headset events to help debug issue.
Eric Olsen [Mon, 23 Nov 2009 21:06:07 +0000 (13:06 -0800)]
Add logging of headset events to help debug issue.
Signed-off-by: Eric Olsen <eolsen@android.com>
Scott Main [Mon, 23 Nov 2009 21:04:27 +0000 (13:04 -0800)]
am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair
* commit '
5e7f1fbe161d7015dde6e893351238749f906c8a':
droiddoc change: add flag to offline docs build to signal
Android (Google) Code Review [Mon, 23 Nov 2009 20:56:19 +0000 (12:56 -0800)]
Merge change Id2ee762d into eclair-sdk
* changes:
droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
Android (Google) Code Review [Mon, 23 Nov 2009 19:57:08 +0000 (11:57 -0800)]
Merge change I1691f3d3 into eclair
* changes:
Add CPUFREQ_STATS event tag DO NOT MERGE
Android (Google) Code Review [Mon, 23 Nov 2009 19:11:55 +0000 (11:11 -0800)]
Merge change I2083b297 into eclair
* changes:
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
Dianne Hackborn [Sat, 21 Nov 2009 02:09:03 +0000 (18:09 -0800)]
Fix issue #
2267665 IME keyboard appears as Blank in compose view...
...if you re-lunch messaging application after deleting the
character and pressing home key
Change-Id: Idc7da05e54730958644e80069764237e5db6f288
Android (Google) Code Review [Mon, 23 Nov 2009 18:36:32 +0000 (10:36 -0800)]
Merge change Id886fb28 into eclair
* changes:
Fix deadlock in WindowManagerService.reenableKeyguard()
Android (Google) Code Review [Mon, 23 Nov 2009 16:39:24 +0000 (08:39 -0800)]
Merge change I43f72dd1 into eclair
* changes:
Don't block TIME_TICK broadcasts in the DigitalClock widget.
Android (Google) Code Review [Mon, 23 Nov 2009 05:54:29 +0000 (21:54 -0800)]
Merge change Ia3acc2ee into eclair
* changes:
Fix pairings lost on reboot.
Mike Lockwood [Sun, 22 Nov 2009 06:42:24 +0000 (01:42 -0500)]
Fix deadlock in WindowManagerService.reenableKeyguard()
If reenableKeyguard() is called before the previous disableKeyguard() call is processed,
then TokenWatcher.sendNotificationLocked() will cancel the request, resulting in neither
the TokenWatcher acquired() or released() methods being called.
In that case, reenableKeyguard() will hang waiting for released() to set
mWaitingUntilKeyguardReenabled to false. Now we only wait in reenableKeyguard()
if the TokenWatcher acquired() method is called and the keyguard has actually been disabled.
This should fix bug b/
2270192
Change-Id: Id886fb28df607dbb4543124f2db6997121d6a682
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dan Egnor [Sat, 21 Nov 2009 19:06:50 +0000 (11:06 -0800)]
Add CPUFREQ_STATS event tag
DO NOT MERGE