OSDN Git Service
Dmitri Plotnikov [Wed, 14 Oct 2009 01:47:56 +0000 (18:47 -0700)]
am
6e144ad8: Making new Contacts APIs visible in Eclair SDK
Merge commit '
6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp
* commit '
6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Dmitri Plotnikov [Wed, 14 Oct 2009 01:08:25 +0000 (18:08 -0700)]
Making new Contacts APIs visible in Eclair SDK
Bug: http://b/
2186595
Change-Id: Iaba8514276299504af6ab0714577eb37d9608237
Jeff Sharkey [Wed, 14 Oct 2009 01:05:48 +0000 (18:05 -0700)]
am
a78a9d4c: Correct non-opaque list separator assets.
Merge commit '
a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-plus-aosp
* commit '
a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
Correct non-opaque list separator assets.
Jeff Sharkey [Tue, 13 Oct 2009 23:28:36 +0000 (16:28 -0700)]
Correct non-opaque list separator assets.
Fixes http://b/
2186076
Robert Greenwalt [Tue, 13 Oct 2009 21:12:03 +0000 (14:12 -0700)]
am
64d54042: Merge change I61c08260 into eclair
Merge commit '
64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-plus-aosp
* commit '
64d54042ff5c2c736a65f200296dbc3bceaa9029':
Futher reduce the logging of EriManager.
Android (Google) Code Review [Tue, 13 Oct 2009 21:07:10 +0000 (17:07 -0400)]
Merge change I61c08260 into eclair
* changes:
Futher reduce the logging of EriManager.
Robert Greenwalt [Tue, 13 Oct 2009 20:53:22 +0000 (13:53 -0700)]
Futher reduce the logging of EriManager.
There was another log statement that was poluting radio logs.
bug:
2180891
Dianne Hackborn [Tue, 13 Oct 2009 18:52:58 +0000 (11:52 -0700)]
am
2a21a77d: Merge change I1369e9ab into eclair
Merge commit '
2a21a77d5cf481b129a7cb4e3e00424e4d300e6d' into eclair-plus-aosp
* commit '
2a21a77d5cf481b129a7cb4e3e00424e4d300e6d':
Work on issue #
2144454: Inconsistent swipes...
Android (Google) Code Review [Tue, 13 Oct 2009 18:45:56 +0000 (14:45 -0400)]
Merge change I1369e9ab into eclair
* changes:
Work on issue #
2144454: Inconsistent swipes...
Dianne Hackborn [Tue, 13 Oct 2009 06:21:18 +0000 (23:21 -0700)]
Work on issue #
2144454: Inconsistent swipes...
This introduces some hacks in the framework to try to clean up the
data we are getting from the touch screen. There are two main things
being done here:
1. Look for changes in position that are unreasonably large, and
ignore them. This is intended to eliminate the spurious jumps that
often happen when releasing.
2. Add some simple adaptive averaging of the touch data. If the
difference between the last and next point is large enough, we
disable the averaging; otherwise we average up to the last 5 points.
The goal is to get rid of the noise of small movements so that things
like taps don't look like short flings, while still responding quickly
to rapid movement.
For averaging pressure, we also weight each averaged coordinate by
the reported pressure at that point. This is intended to keep the
coordinates closer together during a release, when the pressure is
going down and the accuracy decreasing. It may also result in some
other interesting artifacts, but hopefully nothing problematic.
Change-Id: I1369e9ab015c406946a45c2d72547da9c604178f
Robert Greenwalt [Tue, 13 Oct 2009 16:54:36 +0000 (09:54 -0700)]
am
16cb04ab: Merge change If1acb2dd into eclair
Merge commit '
16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-plus-aosp
* commit '
16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
Add a little logging to diagnose wifi cycle bug
Android (Google) Code Review [Tue, 13 Oct 2009 16:45:30 +0000 (12:45 -0400)]
Merge change If1acb2dd into eclair
* changes:
Add a little logging to diagnose wifi cycle bug
Robert Greenwalt [Tue, 13 Oct 2009 15:20:55 +0000 (08:20 -0700)]
Add a little logging to diagnose wifi cycle bug
Hiroshi approved (with serious code review).
bug:
2171575
Dave Sparks [Tue, 13 Oct 2009 10:11:09 +0000 (03:11 -0700)]
am
69e2ef47: Merge change I9f93ce61 into eclair
Merge commit '
69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-plus-aosp
* commit '
69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
Throttle camera preview frames to the app. Bug
2180302.
Android (Google) Code Review [Tue, 13 Oct 2009 10:02:59 +0000 (06:02 -0400)]
Merge change I9f93ce61 into eclair
* changes:
Throttle camera preview frames to the app. Bug
2180302.
Dave Sparks [Tue, 13 Oct 2009 09:28:54 +0000 (02:28 -0700)]
Throttle camera preview frames to the app. Bug
2180302.
With higher frame rates and larger preview frames, we can easily
flood the application with too much data. This patch fakes the
old camera preview mode by doing continuous one-shot frames.
After the previous frame is handled, if the application hasn't
cleared the preview callback, we start another one-shot preview
frame. With this change, the application should never have more
than one preview frame unless it is explicitly saving references
to them.
modified: core/java/android/hardware/Camera.java
Grace Kloba [Tue, 13 Oct 2009 01:36:18 +0000 (18:36 -0700)]
am
2e778c17: Merge change I124356f6 into eclair
Merge commit '
2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-plus-aosp
* commit '
2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
Android (Google) Code Review [Tue, 13 Oct 2009 01:30:04 +0000 (21:30 -0400)]
Merge change I124356f6 into eclair
* changes:
Continue caching "POST" result so that we won't get the resubmission warning when back to Google search result.
Grace Kloba [Tue, 13 Oct 2009 00:39:50 +0000 (17:39 -0700)]
Continue caching "POST" result so that we won't get
the resubmission warning when back to Google search result.
Fix http://b/issue?id=
1490379
Break/reopen http://b/issue?id=
1980031
Libin Tang [Mon, 12 Oct 2009 21:23:43 +0000 (14:23 -0700)]
am
febb94cd: Make standard roaming indicator display indications configurable
Merge commit '
febb94cdbb7c7b7091401d21824bfab32b9daca5' into eclair-plus-aosp
* commit '
febb94cdbb7c7b7091401d21824bfab32b9daca5':
Make standard roaming indicator display indications configurable
Libin Tang [Wed, 7 Oct 2009 15:29:39 +0000 (10:29 -0500)]
Make standard roaming indicator display indications configurable
Allow the ERI overlay file to specify the text for any built-in strings.
Currently only the hard-coded strings are used for those.
Bug:
2170881
Change-Id: I5d6169696a4558e62587585e17f908f823c54a2b
Robert Greenwalt [Mon, 12 Oct 2009 19:33:36 +0000 (12:33 -0700)]
am
6d02f3f3: Merge change I71f48a21 into eclair
Merge commit '
6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84' into eclair-plus-aosp
* commit '
6d02f3f3ff1962bdcf2a1dcd86b433c9614c3d84':
Reduce the amount of EriManager Logging.
Android (Google) Code Review [Mon, 12 Oct 2009 19:25:51 +0000 (15:25 -0400)]
Merge change I71f48a21 into eclair
* changes:
Reduce the amount of EriManager Logging.
Robert Greenwalt [Mon, 12 Oct 2009 19:13:14 +0000 (12:13 -0700)]
Reduce the amount of EriManager Logging.
It was filling the radio log with noise. Added a VDBG set to false to preserve the logging
but deactivate it.
bug:
2180891
Dima Zavin [Mon, 12 Oct 2009 19:08:10 +0000 (12:08 -0700)]
am
98b3def2: Merge change I6261ab54 into eclair
Merge commit '
98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-plus-aosp
* commit '
98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Android (Google) Code Review [Mon, 12 Oct 2009 19:01:43 +0000 (15:01 -0400)]
Merge change I6261ab54 into eclair
* changes:
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Mike Lockwood [Mon, 12 Oct 2009 18:21:54 +0000 (11:21 -0700)]
am
6abf7c8f: Merge change Iad66a274 into eclair
Merge commit '
6abf7c8fccf1430bf5d730592b79d77fbeccfe5b' into eclair-plus-aosp
* commit '
6abf7c8fccf1430bf5d730592b79d77fbeccfe5b':
Fix race condition in WindowManagerService.disableKeyguard()
Android (Google) Code Review [Mon, 12 Oct 2009 18:14:44 +0000 (14:14 -0400)]
Merge change Iad66a274 into eclair
* changes:
Fix race condition in WindowManagerService.disableKeyguard()
Nick Pelly [Mon, 12 Oct 2009 18:12:02 +0000 (11:12 -0700)]
am
d301c904: Merge change I305c181c into eclair
Merge commit '
d301c90446644f63cda9b9263f83332676065bb4' into eclair-plus-aosp
* commit '
d301c90446644f63cda9b9263f83332676065bb4':
Delay 500ms between each registering each SDP record using sdptool.
Dianne Hackborn [Mon, 12 Oct 2009 18:11:50 +0000 (11:11 -0700)]
am
f836acf2: Merge change I067d55ea into eclair
Merge commit '
f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-plus-aosp
* commit '
f836acf241f10d943d72d439fa425fda73a6d56b':
Fix issue #
2179931: Power key to wake up frequently ignored when in dock app
Android (Google) Code Review [Mon, 12 Oct 2009 18:05:44 +0000 (14:05 -0400)]
Merge change I305c181c into eclair
* changes:
Delay 500ms between each registering each SDP record using sdptool.
Android (Google) Code Review [Mon, 12 Oct 2009 18:04:31 +0000 (14:04 -0400)]
Merge change I067d55ea into eclair
* changes:
Fix issue #
2179931: Power key to wake up frequently ignored when in dock app
Nick Pelly [Mon, 12 Oct 2009 16:54:39 +0000 (09:54 -0700)]
Delay 500ms between each registering each SDP record using sdptool.
This is to workaround an issue where SDP records will fail to register using
sdptool. When we run SystemService.start() it forks sdptool, so if we do this
four times in a row these forked processes can run in parallel, and one or
more of them fails. There is probably some thready safety issue in sdptool
or Bluez that makes it unsafe to run sdptool in parallel.
As a workaround, delay 500ms between each run of sdptool to register SDP
records when starting Bluetooth.
Before this fix it was easy to reproduce problems with service record
registration. If you turn BT off/on multiple times you can see that sometimes
one or more service records are missing. Repro rate is about 20% in my tests.
Result is that remote devices cannot connect to the missing service.
After this fix I am unable to reproduce any missing SDP records, after 30+
cycles of BT on/off. Motorola BT team also ran stress tests overnight with this
fix and were unable to reproduce the missing SDP records.
This is a low risk fix. It does delay some records from being registered
by an additional 1.5 seconds (on top of the 3 second delay we already had),
so if you try and very quickly connect a BT service after turning BT on it
won't work the first time.
Do not merge. (I will use a less hacky fix for MR2/Master)
Change-Id: I305c181c3194e8ce25e3825320cc2e1ef6d3d3cc
Bug:
2180800
DrNo: eastham
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Mike Lockwood [Sun, 11 Oct 2009 20:57:08 +0000 (16:57 -0400)]
Fix race condition in WindowManagerService.disableKeyguard()
TokenWatcher.acquire() synchronizes on mTokens, not this,
so we need to synchronize on mKeyguardDisabled in disableKeyguard()
to synchronize properly with reenableKeyguard().
This should fix b/
2180142 (Stuck in enable keyguard when receiving phone call)
Change-Id: Iad66a2748c7fbf2c516fdb8a00988696719ea80c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Hamilton [Sat, 10 Oct 2009 18:26:43 +0000 (11:26 -0700)]
am
6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '
6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-plus-aosp
* commit '
6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Jeff Hamilton [Sat, 10 Oct 2009 17:06:19 +0000 (12:06 -0500)]
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Change-Id: I45af1fe80f6f93a1db8389600dc780af9cedf22c
Fred Quintana [Sat, 10 Oct 2009 04:15:40 +0000 (21:15 -0700)]
am
083a50a3: Merge change I66693ea2 into eclair
Merge commit '
083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-plus-aosp
* commit '
083a50a394915b562ad53be9fd8ec7524e3db21c':
fix sync exponential backoff for expedited syncs
Android (Google) Code Review [Sat, 10 Oct 2009 04:10:29 +0000 (00:10 -0400)]
Merge change I66693ea2 into eclair
* changes:
fix sync exponential backoff for expedited syncs
Dima Zavin [Sat, 10 Oct 2009 01:04:58 +0000 (18:04 -0700)]
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
This reverts commit
ed5ecdba36648973be3033a045e2ece8bf039e4a.
Dianne Hackborn [Sat, 10 Oct 2009 00:39:26 +0000 (17:39 -0700)]
am
ee110be0: Fix issue #
2179891: Need to update 5.xml
Merge commit '
ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-plus-aosp
* commit '
ee110be02256b816ac6d863e39cb8b11b8071baa':
Fix issue #
2179891: Need to update 5.xml
Dianne Hackborn [Sat, 10 Oct 2009 00:38:26 +0000 (17:38 -0700)]
Fix issue #
2179931: Power key to wake up frequently ignored when in dock app
The dock app is forcing the screen to a particular brightness level. This
causes the window manager to often call into the power manager with the
new brightness. This causes us to go in to updateLightsLocked() to figure
out and apply the real brightness to use. When the screen is off the
real brightness always remains 0, but even if it didn't change from the
last one we would start an animation which would when done put the system
to sleep and fight with the user trying to turn the device on.
Now, if the new target brightness is the same as the last one, we leave the
animation as-is -- either running or not as appropriate.
Change-Id: I067d55ea2b39e294c5d5291587a4d8727c0b8083
Dianne Hackborn [Fri, 9 Oct 2009 23:41:40 +0000 (16:41 -0700)]
Fix issue #
2179891: Need to update 5.xml
Copied current.xml to 5.xml.
Change-Id: I5eaa806eef9a9a3135b021d7db179325ff7663fc
Fred Quintana [Fri, 9 Oct 2009 23:32:02 +0000 (16:32 -0700)]
fix sync exponential backoff for expedited syncs
Romain Guy [Fri, 9 Oct 2009 23:13:18 +0000 (16:13 -0700)]
am
8eb955b9: Merge change I5e482bbc into eclair
Merge commit '
8eb955b934c49ce814bce1a84bc995eef849051d' into eclair-plus-aosp
* commit '
8eb955b934c49ce814bce1a84bc995eef849051d':
Add new RenderScript sample: ImageProcessing.
Eric Fischer [Fri, 9 Oct 2009 23:08:02 +0000 (16:08 -0700)]
am
c08efb27: Import revised translations. DO NOT MERGE
Merge commit '
c08efb2712fbcc25ce9c208f3c9d7c0935e209d4' into eclair-plus-aosp
* commit '
c08efb2712fbcc25ce9c208f3c9d7c0935e209d4':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Fri, 9 Oct 2009 23:07:12 +0000 (19:07 -0400)]
Merge change I5e482bbc into eclair
* changes:
Add new RenderScript sample: ImageProcessing.
Romain Guy [Fri, 9 Oct 2009 23:05:25 +0000 (16:05 -0700)]
Add new RenderScript sample: ImageProcessing.
Change-Id: I5e482bbc34911c940a3a74258f8f8549b1939bc4
Eric Fischer [Fri, 9 Oct 2009 22:33:08 +0000 (15:33 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Robert Greenwalt [Fri, 9 Oct 2009 08:22:57 +0000 (01:22 -0700)]
am
98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '
98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-plus-aosp
* commit '
98e0b146b80670b52805b4b210ef5582dad6bb68':
Make PhoneStateListeners not call TelephonyManager
Robert Greenwalt [Fri, 9 Oct 2009 04:15:52 +0000 (21:15 -0700)]
Make PhoneStateListeners not call TelephonyManager
Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.
bug:
2173053
Grace Kloba [Fri, 9 Oct 2009 07:10:32 +0000 (00:10 -0700)]
am
1184313c: Setting WebCore cache limit depending on the memory class.
Merge commit '
1184313cbea3b34a4596a90be7081551d36f251a' into eclair-plus-aosp
* commit '
1184313cbea3b34a4596a90be7081551d36f251a':
Setting WebCore cache limit depending on the memory class.
Grace Kloba [Fri, 9 Oct 2009 03:48:09 +0000 (20:48 -0700)]
Setting WebCore cache limit depending on the memory class.
Fix http://b/issue?id=
2176656
Dan Egnor [Fri, 9 Oct 2009 03:25:10 +0000 (20:25 -0700)]
am
6903d5ce: Merge change Iee649a81 into eclair
Merge commit '
6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp
* commit '
6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Android (Google) Code Review [Fri, 9 Oct 2009 03:19:03 +0000 (23:19 -0400)]
Merge change Iee649a81 into eclair
* changes:
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads. See bug
2177046.
Dan Egnor [Fri, 9 Oct 2009 02:51:51 +0000 (19:51 -0700)]
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
See bug
2177046.
Jim Miller [Fri, 9 Oct 2009 02:09:44 +0000 (19:09 -0700)]
am
ad60e7fe: Merge change I9485aec1 into eclair
Merge commit '
ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp
* commit '
ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for
2177367: Reduce duration of vibrate in RotaryLockScreen
Dianne Hackborn [Fri, 9 Oct 2009 02:09:38 +0000 (19:09 -0700)]
am
2c6c5e6e: Fix issue #
2176944: Need API so browser, others can determine memory size of device
Merge commit '
2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp
* commit '
2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #
2176944: Need API so browser, others can determine memory size of device
Android (Google) Code Review [Fri, 9 Oct 2009 02:04:36 +0000 (22:04 -0400)]
Merge change I9485aec1 into eclair
* changes:
Fix for
2177367: Reduce duration of vibrate in RotaryLockScreen
Jim Miller [Fri, 9 Oct 2009 01:49:53 +0000 (18:49 -0700)]
Fix for
2177367: Reduce duration of vibrate in RotaryLockScreen
BUG=
2177367
Dianne Hackborn [Fri, 9 Oct 2009 01:43:54 +0000 (18:43 -0700)]
am
d10d02f5: Merge change I490e01ba into eclair
Merge commit '
d10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-plus-aosp
* commit '
d10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
Fix issue #
2174566: HOT STABILITY: NPE in activity manager
Dianne Hackborn [Fri, 9 Oct 2009 01:43:48 +0000 (18:43 -0700)]
am
89becd79: Fix issue #
2177262: Improve animations
Merge commit '
89becd79da643421adc2dbb0cdccc547a0611abb' into eclair-plus-aosp
* commit '
89becd79da643421adc2dbb0cdccc547a0611abb':
Fix issue #
2177262: Improve animations
Dianne Hackborn [Fri, 9 Oct 2009 00:55:49 +0000 (17:55 -0700)]
Fix issue #
2176944: Need API so browser, others can determine memory size of device
Change-Id: I65d91cdb70df91b67fe84297dd6a94d26a785131
Android (Google) Code Review [Fri, 9 Oct 2009 01:38:39 +0000 (21:38 -0400)]
Merge change I490e01ba into eclair
* changes:
Fix issue #
2174566: HOT STABILITY: NPE in activity manager
Dianne Hackborn [Fri, 9 Oct 2009 01:34:57 +0000 (18:34 -0700)]
Fix issue #
2177262: Improve animations
Slower is better.
Change-Id: Id609f253e43814b4c7689ed9b076ef75f4e345a6
Dianne Hackborn [Thu, 8 Oct 2009 23:58:20 +0000 (16:58 -0700)]
am
9e2562b8: Merge change I88c6e267 into eclair
Merge commit '
9e2562b8f97fec7e13e6302678459e99b8cccb2a' into eclair-plus-aosp
* commit '
9e2562b8f97fec7e13e6302678459e99b8cccb2a':
Fix issue #
2175693: Add vmallocinfo to dumpstate
Android (Google) Code Review [Thu, 8 Oct 2009 23:52:35 +0000 (19:52 -0400)]
Merge change I88c6e267 into eclair
* changes:
Fix issue #
2175693: Add vmallocinfo to dumpstate
Nick Pelly [Thu, 8 Oct 2009 23:47:19 +0000 (16:47 -0700)]
am
db7ae10d: Remove STOPSHIP BT logging.
Merge commit '
db7ae10d6b8e86ff5311512de45afa65a1b0a738' into eclair-plus-aosp
* commit '
db7ae10d6b8e86ff5311512de45afa65a1b0a738':
Remove STOPSHIP BT logging.
Nick Pelly [Thu, 8 Oct 2009 23:47:13 +0000 (16:47 -0700)]
am
e6ee3be1: BT API security audit: fix a couple of permission mistakes.
Merge commit '
e6ee3be1c254404dad842298f6f56c11cc6c7ac8' into eclair-plus-aosp
* commit '
e6ee3be1c254404dad842298f6f56c11cc6c7ac8':
BT API security audit: fix a couple of permission mistakes.
Nick Pelly [Thu, 8 Oct 2009 22:54:41 +0000 (00:54 +0200)]
Remove STOPSHIP BT logging.
Do not merge.
Change-Id: I428bc0fc67030f24112f2e9c865824dfaea4897d
DrNo: eastham
Bug:
2089423
Joke: Why was Tigger looking in the toilet? To find Pooh
Nick Pelly [Thu, 8 Oct 2009 21:27:28 +0000 (23:27 +0200)]
BT API security audit: fix a couple of permission mistakes.
Make functions that are meant to be BLUETOOTH_ADMIN really
BLUETOOTH_ADMIN.
Add some missing javadoc for permissions.
The only functional change here is the BLUETOOTH->BLUETOOTH_ADMIN
changes. This is super safe because every system app that uses BT
has both permissions.
Change-Id: Iddc61f9fd5d81fe0171358665a0fa52f2fa02871
DrNo: eastham
Joke: How do you catch a rabbit? Hide behind a tree and make carrott noises.
Dianne Hackborn [Thu, 8 Oct 2009 17:49:12 +0000 (10:49 -0700)]
Fix issue #
2175693: Add vmallocinfo to dumpstate
Change-Id: I88c6e2679919e56f581fcf79dbe683393dd8ce27
Dianne Hackborn [Thu, 8 Oct 2009 23:22:03 +0000 (16:22 -0700)]
Fix issue #
2174566: HOT STABILITY: NPE in activity manager
- Don't crash if the service's app process doesn't have a thread (this
can happen if we are currently starting the process and then try to
start the service again).
- Be more robust about deciding to start a service's process: try each
time it is started; the startProcess call will take care of ignoring
it if the process is already started.
- Fix some issues where we would leave dead processes on the low memory
list.
Change-Id: I490e01ba7b45adc191bab7ace377b6873e284897
Mathias Agopian [Thu, 8 Oct 2009 23:20:45 +0000 (16:20 -0700)]
am
846322a9: Merge change Ib96df854 into eclair
Merge commit '
846322a9ae5ef8155cca0059d3f64d718516ca13' into eclair-plus-aosp
* commit '
846322a9ae5ef8155cca0059d3f64d718516ca13':
add a way to easily catch and log GL errors (compile time flag)
Android (Google) Code Review [Thu, 8 Oct 2009 23:10:42 +0000 (19:10 -0400)]
Merge change Ib96df854 into eclair
* changes:
add a way to easily catch and log GL errors (compile time flag)
Mathias Agopian [Thu, 8 Oct 2009 22:58:11 +0000 (15:58 -0700)]
add a way to easily catch and log GL errors (compile time flag)
Eric Fischer [Thu, 8 Oct 2009 22:10:38 +0000 (15:10 -0700)]
am
aaa6299b: am
24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f' into eclair-plus-aosp
* commit '
aaa6299bcd1a44f5f066ef48fb99cc0a704cbd0f':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Thu, 8 Oct 2009 22:10:32 +0000 (15:10 -0700)]
am
ea110274: am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
ea11027401a6b0e8fc351b7585d929e8fdb3fd08' into eclair-plus-aosp
* commit '
ea11027401a6b0e8fc351b7585d929e8fdb3fd08':
Import revised translations. DO NOT MERGE
Mike Lockwood [Thu, 8 Oct 2009 22:10:25 +0000 (15:10 -0700)]
am
348b92bd: Merge change Iee227ace into eclair
Merge commit '
348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp
* commit '
348b92bd513087369ac682e29620d7829fa1381b':
GPS: Fix problem with SUPL when SUPL APN is already active.
Eric Fischer [Thu, 8 Oct 2009 22:03:24 +0000 (15:03 -0700)]
am
24c8645a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
24c8645a995f58885fefcaade0681dd459452deb' into eclair
* commit '
24c8645a995f58885fefcaade0681dd459452deb':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Thu, 8 Oct 2009 22:03:15 +0000 (15:03 -0700)]
am
ac62c84a: (-s ours) DO NOT MERGE merge from donut-gms
Merge commit '
ac62c84a321e2720ab99e37724aba0b6406f39a6' into eclair
* commit '
ac62c84a321e2720ab99e37724aba0b6406f39a6':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 8 Oct 2009 21:58:11 +0000 (17:58 -0400)]
Merge change Iee227ace into eclair
* changes:
GPS: Fix problem with SUPL when SUPL APN is already active.
Eric Laurent [Thu, 8 Oct 2009 21:47:26 +0000 (14:47 -0700)]
am
ff94720b: Merge change I80a6a229 into eclair
Merge commit '
ff94720b8bf9f83f326197cb0cb27576168e9448' into eclair-plus-aosp
* commit '
ff94720b8bf9f83f326197cb0cb27576168e9448':
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Android (Google) Code Review [Thu, 8 Oct 2009 21:36:18 +0000 (17:36 -0400)]
Merge change I80a6a229 into eclair
* changes:
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Mike Lockwood [Thu, 8 Oct 2009 19:45:03 +0000 (15:45 -0400)]
GPS: Fix problem with SUPL when SUPL APN is already active.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.
Fixes bug b/
2155661
Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jaikumar Ganesh [Thu, 8 Oct 2009 20:18:30 +0000 (13:18 -0700)]
am
9d5b5899: Merge change Ie5d93b7e into eclair
Merge commit '
9d5b58991ef90e91b3c942c80ae3502ed62d10aa' into eclair-plus-aosp
* commit '
9d5b58991ef90e91b3c942c80ae3502ed62d10aa':
Set the Bond State to NONE when we receive a Agent Cancel.
Android (Google) Code Review [Thu, 8 Oct 2009 20:11:13 +0000 (16:11 -0400)]
Merge change Ie5d93b7e into eclair
* changes:
Set the Bond State to NONE when we receive a Agent Cancel.
Eric Fischer [Thu, 8 Oct 2009 19:16:00 +0000 (12:16 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I70d32c0d002d1ba3d08813c1e8985421fca81790
Eric Laurent [Thu, 8 Oct 2009 17:58:19 +0000 (10:58 -0700)]
Fix issue
2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Added a workarouond to request the A2DP output standby directly to audio hardware when the sink is suspended as it seems that the suspend request often fails.
Also take into account resume requests received while a suspend request is pending.
John Wang [Thu, 8 Oct 2009 18:57:11 +0000 (11:57 -0700)]
am
33e21fcc: Control H icon display in Status bar.
Merge commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp
* commit '
33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
John Wang [Thu, 8 Oct 2009 17:35:27 +0000 (10:35 -0700)]
Control H icon display in Status bar.
Bug
2138275. Add a config setting to control if status bar
should show different icons for UMTS and HSPA connnection.
Romain Guy [Thu, 8 Oct 2009 18:19:14 +0000 (11:19 -0700)]
am
3b36ed09: Merge change I95319bde into eclair
Merge commit '
3b36ed09293965e7e5dc20dfa514422388e796d6' into eclair-plus-aosp
* commit '
3b36ed09293965e7e5dc20dfa514422388e796d6':
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Daisuke Miyakawa [Thu, 8 Oct 2009 18:19:08 +0000 (11:19 -0700)]
am
387e73bd: Merge change Ib977f2bd into eclair
Merge commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-plus-aosp
* commit '
387e73bd8fbecae0b95e3005ca8187ddbda1aff7':
Make vCard import Photo from vCard file :(
Android (Google) Code Review [Thu, 8 Oct 2009 17:53:54 +0000 (13:53 -0400)]
Merge change I95319bde into eclair
* changes:
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
Android (Google) Code Review [Thu, 8 Oct 2009 17:49:39 +0000 (13:49 -0400)]
Merge change Ib977f2bd into eclair
* changes:
Make vCard import Photo from vCard file :(
Romain Guy [Thu, 8 Oct 2009 17:48:54 +0000 (10:48 -0700)]
Fixes #
2175599. Prevents an NPE when AttachInfo is null.
This bug was introduced by a change made to query the window's opacity.
Approved by mcleron.
Change-Id: I95319bde72b0faade095bbbbb317e84b9be8efa8
Joshua Bartel [Thu, 8 Oct 2009 17:41:13 +0000 (10:41 -0700)]
am
bd324c9b: Merge change I50a321c9 into eclair
Merge commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-plus-aosp
* commit '
bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
LocationManagerService: Fix race when removing LocationListener
Jean-Baptiste Queru [Thu, 8 Oct 2009 17:00:40 +0000 (10:00 -0700)]
DO NOT MERGE merge from donut-gms
Android (Google) Code Review [Thu, 8 Oct 2009 16:58:48 +0000 (12:58 -0400)]
Merge change I50a321c9 into eclair
* changes:
LocationManagerService: Fix race when removing LocationListener
San Mehat [Thu, 8 Oct 2009 15:23:02 +0000 (08:23 -0700)]
am
e9296876: Merge change Ib7c34cec into eclair
Merge commit '
e9296876140ba055d311f3f11af25beae652e6d8' into eclair-plus-aosp
* commit '
e9296876140ba055d311f3f11af25beae652e6d8':
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'
Android (Google) Code Review [Thu, 8 Oct 2009 15:11:50 +0000 (11:11 -0400)]
Merge change Ib7c34cec into eclair
* changes:
dumpstate: 'RAMCONSOLE' -> 'LAST KMSG'