10048 Commits

Author SHA1 Message Date
John Wang
098295a5a3 Merge "Updated emergency string when locale changes." into eclair 2010-01-22 13:17:25 -08:00
John Wang
670db2c696 Updated emergency string when locale changes.
For bug 2352094.
2010-01-22 13:07:58 -08:00
Grace Kloba
5ff24d5da4 DO NOT MERGE
This reverts commit 52cb3cbd6fe06e3706be1a7c2939f027106aaaf7.
2010-01-22 12:45:54 -08:00
Eric Laurent
a59551bade Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 2010-01-22 10:14:26 -08:00
Eric Laurent
700aab67eb Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
The problem occurs if the delay between the headset removal and insertion is less than one second.
In this case, as the headset disconnection intent is broadcast with a 1 second delay to allow music to pause
before updating the route, the connection intent is broadcast before and is ignored, leaving the system
in a state where the headset is considered disconnected.

The fix consists in inserting a delay before broadcasting the connection intent if a disconnection
intent is pending broadcast.
2010-01-22 09:31:12 -08:00
John Wang
08cb002402 Handle emergency calls only status in ServiceStateTracker.
For bug 2352094, handle emergency calls only status and
pass the emergency calls only string via SPN_STRING_UPDATED intent.
2010-01-22 01:03:14 -08:00
Fred Quintana
9a400fa4d3 Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
jsh
036e21083d Fix NPE when importing from USIM.
Need to check if fileIds is empty.

b/2349232
2010-01-21 16:58:17 -08:00
Yu Shan Emily Lau
b1780474e6 Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 2010-01-21 15:07:51 -08:00
Eric Fischer
50adb16753 Pull in "emergency calls only" translations. 2010-01-21 13:52:09 -08:00
John Wang
7f70998dec Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Fred Quintana
44037e6c41 initialize sync adapters that get installed while the system is running
bug http://b/issue?id=2360782
2010-01-21 13:14:49 -08:00
John Wang
f936745f5a Add Emergency Calls Only String.
Prepare strings for bug 2352094.

The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
2010-01-21 12:46:01 -08:00
Yu Shan Emily Lau
f465dc0367 Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player. 2010-01-21 12:38:02 -08:00
Wei Huang
495bae67ff Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 2010-01-21 12:21:11 -08:00
Wei Huang
22149f3d4e fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.

I tested this by calling

  ContactHeaderWidget.bindFromPhoneNumber(number1);
  ContactHeaderWidget.bindFromPhoneNumber(number2);

where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.

- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.

Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
2010-01-21 12:06:43 -08:00
Ying Wang
6f9e2c648c Merge "Find layout classes in all "layout-*" dirs." into eclair 2010-01-21 11:07:14 -08:00
Robert Greenwalt
9fdf82e080 Merge "Try to switch to another default net on connection failure." into eclair 2010-01-21 09:57:46 -08:00
Irfan Sheriff
dcc14d6a26 Merge "Use MCC value to always override channel count setting" into eclair 2010-01-21 07:46:49 -08:00
Grace Kloba
f6aed0e0a7 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
d5ada83c71 ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.

This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
2010-01-20 23:06:43 -08:00
Ying Wang
c111296b97 Find layout classes in all "layout-*" dirs.
Before this CL, the generated keep flags for layout classes are incomplete,
such as layout classes in res/layout-port/ and res/layout-land and so on.
2010-01-20 22:12:46 -08:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.

Added over limit zoom feedback for pinch in the WebView.

Fix http://b/issue?id=2383539
2010-01-20 21:58:27 -08:00
Nick Pelly
e834722f54 Merge "Fix failure to open AVRCP input device due to EPERM." into eclair 2010-01-20 20:43:54 -08:00
Nick Pelly
e6b1bbd8ac Fix failure to open AVRCP input device due to EPERM.
Sleep for 100us and try to open the input device again if it fails, with a
maximum of 10 attempts.

We need the retry logic because setting permissions on a new input device is
racy. The init process watches for new input device (via uevent) and sets the
permission on them in devices.c:make_device(). However at the same time
EventHub.cpp watches for new input devices from the system_server process, and
immediately tries to open them. I can't see a simple way to avoid this race
condition.

As best as I can tell this race condition has always exisited.
There must have been some timing change that happened recently that causes us
to hit this race condition much more often. See repro notes in referenced bug.

Bug: 2375632
2010-01-20 19:56:24 -08:00
Robert Greenwalt
da03c4e4b3 Try to switch to another default net on connection failure.
This shouldn't be required, but there seems to be something odd going on
in wifi and it doesn't hurt to try other available options.  Makes a
connection failure case work like a disconnected case.

bug: 2378462
2010-01-20 19:29:41 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00
Mike Reed
a66baccc8f Merge "Do not merge" into eclair 2010-01-20 18:32:32 -08:00
Xavier Ducrohet
d1da5fa2da Revert "SDK doc change: Add doc update for NDKr3."
This reverts commit 1dced50963312c5d340cbd129d0017d9cbb45f0b.
2010-01-20 17:45:18 -08:00
Irfan Sheriff
51e2f71f4a Use MCC value to always override channel count setting
FCC raised the issue of not allowing users to configure
channel counts beyond 11. This change enforces the channel
count based on MCC values.

Bug: 2378844
2010-01-20 17:44:07 -08:00
Grace Kloba
89e3c1ab01 Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair 2010-01-20 17:36:50 -08:00
Grace Kloba
8f9fbb0c45 Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=2385061
2010-01-20 17:35:50 -08:00
Xavier Ducrohet
38f7a02a9b Merge "SDK doc change: Add doc update for NDKr3." into eclair 2010-01-20 17:30:27 -08:00
Scott Main
2a79defa5a Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 2010-01-20 17:10:25 -08:00
Scott Main
2c9d7fe21a docs: add guide to copying and installing the Dev Tools app
from the emulator to a device.
2010-01-20 16:58:46 -08:00
Mike Reed
12bcbdc681 Do not merge
port stretchy from master
2010-01-20 16:27:36 -05:00
Irfan Sheriff
48ef378d01 Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair 2010-01-20 13:26:08 -08:00
Robert Greenwalt
1a337547d5 Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair 2010-01-20 13:26:04 -08:00
Mike Reed
9f954cf27e Merge "Do not merge" into eclair 2010-01-20 13:17:49 -08:00
Robert Greenwalt
73912ce083 Add bugreport info about network feature use. DO NOT MERGE
Backported from master change Ib9285359.

We've had a couple bug reports showing the effects of a left-live feature request.
We need a bit more bugreport-time logging.

bug: 2323226
bug: 2377507
change-id: I296b2887101c260aea678bf6db91144535cbad7e
2010-01-20 12:36:09 -08:00
Robert Greenwalt
8c166512a7 Merge "Cleanup of process-specific DNS." into eclair 2010-01-20 11:08:13 -08:00
Irfan Sheriff
0fe3f7cbbf DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Multiple broadcast receiver unregister calls cause exception.

Bug: 2361335
2010-01-20 10:08:23 -08:00
Mike Lockwood
bb79e5fdb5 Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair 2010-01-20 10:00:55 -08:00
Xavier Ducrohet
b44051eee0 Merge "ADT/Layoutlib: implement sweep gradient." into eclair 2010-01-20 09:43:46 -08:00
Mike Lockwood
cf1d8cb36f Be tolerant of GPS session and engine on status messages arriving out of order.
BUG: 2366194

Change-Id: I642dacd397202f671adba5a863394438ca62988d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-20 10:20:54 -05:00
Scott Main
5615ca1979 docs: a lot of revision and expansion of the hello view tutorials
includes new screenshots for some tutorials and a new sample images
zip file

Bug:2338253
2010-01-19 19:46:02 -08:00
Xavier Ducrohet
3330927bdd ADT/Layoutlib: implement sweep gradient.
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
2010-01-19 18:51:06 -08:00
Robert Greenwalt
15abc90147 Cleanup of process-specific DNS.
Backport of MR2 change 421c72b6.

Removes entries sooner.  A bug.
Doesn't add one for phone process at all.  This was intended to be removed long ago.

bug: 2329900
bug: 2377507
2010-01-19 18:01:36 -08:00
Adam Powell
5910cb53ea Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair 2010-01-19 16:40:17 -08:00
Adam Powell
380b525220 Edge of screen slop detection for ScaleGestureDetector. 2010-01-19 16:33:46 -08:00