OSDN Git Service
Dirk Dougherty [Fri, 12 Feb 2010 00:59:14 +0000 (16:59 -0800)]
SDK doc change: Add SDK tools r5 to sdk tab. Changes in installation docs to improve visibility on prerequisites and sequence.
Change-Id: Icf10b6255b5e9f9f4b94d67fd09a34b5994c29d6
Dirk Dougherty [Mon, 8 Mar 2010 17:28:49 +0000 (09:28 -0800)]
Merge "SDK doc change: add ndkr3 doc." into eclair
Dirk Dougherty [Sat, 30 Jan 2010 00:41:05 +0000 (16:41 -0800)]
SDK doc change: add ndkr3 doc.
Bug:
2160782
Change-Id: I97a7ff4ffd5e640278c7b0fa4b5dbc7ce336546a
Katie McCormick [Fri, 5 Mar 2010 00:09:51 +0000 (16:09 -0800)]
Merge "Doc change: Updated AVD instructions in HelloWorld--rev 3. change-id: I90112235687c9c0a73b2eab5fe1101766d47316e" into eclair
Katie McCormick [Fri, 26 Feb 2010 03:50:25 +0000 (19:50 -0800)]
Doc change: Updated AVD instructions in HelloWorld--rev 3.
change-id: I90112235687c9c0a73b2eab5fe1101766d47316e
Eric Laurent [Mon, 22 Feb 2010 09:37:19 +0000 (01:37 -0800)]
Fix issue
2459650.
This change fixes a problem where an unwanted tone is generated by audio policy manager when a MT call is answered.
This is because of a policy that replaces high visibility system sounds (ringtones, alarms...) by a beep when in call.
There is a transitory phase while the call is being answered where the phone state is changed to IN_CALL but the
ringtone is still playing. The audio policy manager then mutes the end of the ringtone and starts playing a beep
in replacement because the ringtone is categorized as high visibility.
The fix consists in changing the ringtone stream type from high visibility to low visibility. This is not a problem as
the only actual use case where a ringtone would be generated while in call is if another call is received.
But in this case, the phone system does not generate a ringtone but a call waiting tone instead.
It is therefore not required to handle a ringtone as a high visibiltiy tone that must be somehow signaled to the user
while in call.
Joe Onorato [Thu, 18 Feb 2010 12:46:32 +0000 (04:46 -0800)]
Merge "Don't crash the system process when apps give us a bad foreground service notification." into eclair
Joe Onorato [Thu, 18 Feb 2010 12:45:17 +0000 (07:45 -0500)]
Don't crash the system process when apps give us a bad foreground service notification.
Romain Guy [Wed, 10 Feb 2010 19:29:22 +0000 (11:29 -0800)]
Manual merge of 40245 (
ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Prevent infinite loop in the Phone UI.
Romain Guy [Wed, 10 Feb 2010 02:50:08 +0000 (18:50 -0800)]
Manual merge of 40170 (
b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Fix the lock screen.
Romain Guy [Tue, 9 Feb 2010 19:30:44 +0000 (11:30 -0800)]
Manual merge of 40080 DO NOT MERGE
Properly notifies listener when an animation is cancelled.
Bug: #
2428005.
android-build SharedAccount [Fri, 12 Feb 2010 01:09:16 +0000 (17:09 -0800)]
cherry pick
d60e29009c1049a9776e6630e9489e1ef3f83491
Revert "Add null checks when scanning a package."
This reverts commit
9e7ac3ba8405f22c11629091449ff35a06b72055.
Wink Saville [Sat, 13 Feb 2010 17:36:17 +0000 (09:36 -0800)]
Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Wink Saville [Sat, 13 Feb 2010 15:56:20 +0000 (07:56 -0800)]
Always assume evdoXxxx signal strength values are correct.
This solves a race condition between the network type changing and
a signal strength changing. This could cause StatusBarPolicy to see
the -1 values for the evdo strength parameters and hence 0 bars would
be displayed.
Bug:
2419251
Change-Id: Iba0bdbd2023b6a5e49fc1f82c997ec3219158286
Xavier Ducrohet [Sat, 13 Feb 2010 01:48:36 +0000 (17:48 -0800)]
Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Xavier Ducrohet [Fri, 5 Feb 2010 02:45:31 +0000 (18:45 -0800)]
Add --auto-add-overlay option to aapt. DO NOT MERGE
This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>
(merge from master)
Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
Scott Main [Fri, 12 Feb 2010 23:25:44 +0000 (15:25 -0800)]
Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Scott Main [Fri, 12 Feb 2010 23:24:13 +0000 (15:24 -0800)]
docs: remove old tutorial and sample pages from the sitemap
Jason Sams [Fri, 12 Feb 2010 02:16:21 +0000 (18:16 -0800)]
DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: libs/rs/rsAllocation.cpp
modified: libs/rs/rsAllocation.h
modified: libs/rs/rsContext.cpp
modified: libs/rs/rsContext.h
modified: libs/rs/rsProgram.cpp
modified: libs/rs/rsProgram.h
Delete the old rollo sample which is obsolete.
Fix film init
Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly.
Fix film
Beging GL2 user shaders. Switch master to using GL2 by default.
Implement RS tracked defered texture and buffer object uploads.
Committer: Jason Sams <rjsams@android.com>
On branch droid
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: libs/rs/rsAllocation.cpp
modified: libs/rs/rsAllocation.h
modified: libs/rs/rsContext.h
modified: libs/rs/rsProgramFragment.cpp
modified: libs/rs/rsSimpleMesh.cpp
Remove check for surface valid that is no longer valid.
Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info.
Continue es2 shader dev
Conflicts:
graphics/java/android/renderscript/Program.java
graphics/java/android/renderscript/ProgramVertex.java
Place shader logging behind prop to declutter logs.
Fix emulated glColor in es2 mode.
Fix live wallpaper many. Z coordinate was being ignored for draw quad call.
Add argument checking to sampler builder to disallow illegal modes.
Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode.
Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
This will break some apps, checkings for other projects will follow to unbreak them.
Disable excessive RS logging.
Add RS support for generic attribs as input to vertex programs.
More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity.
Support npot on es 2.0 HW.
Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots.
Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor.
Implement type generation for user uniforms in vertex shader.
Remove excessive logging, fix error in GLSL uniform generation.
Fix RS mipmap generation for 8 bit alpha textures.
Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names.
Fix some minor bugs with GL state setup that were exposed by Droids driver.
Implement drawSpriteCropped on es2.0
Eric Laurent [Thu, 11 Feb 2010 17:23:21 +0000 (09:23 -0800)]
Merge "Fix issue:
2413494: Add TTY support." into eclair
Eric Laurent [Wed, 10 Feb 2010 19:22:11 +0000 (11:22 -0800)]
Fix issue:
2413494: Add TTY support.
This is a new implementation of TTY support.
Previous implementation in commit
aead64def1fe58c95c086a0ca00cf0b13fa32ef1 is reverted.
The new method does not rely any more on the kernel headset driver to send a UEvent containing
current TTY mode.
Dirk Dougherty [Wed, 10 Feb 2010 17:38:01 +0000 (09:38 -0800)]
Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Bart Sears [Wed, 10 Feb 2010 17:35:37 +0000 (09:35 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Tue, 13 Oct 2009 19:57:08 +0000 (12:57 -0700)]
DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,29843 from eclair-mr2
This will cherry-pick SHA1:
58def690a87b4aa2c01331c06b61e457198de0ea
This will workaround the following three bugs which are occuring because
the webview DB is getting corrupted:
http://b/issue?id=
2338178
http://b/issue?id=
2278210
http://b/issue?id=
2405650
Here are the comments from the eclair-mr2 CL:
If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.
Fix http://b/issue?id=
2179339
Bart Sears [Wed, 10 Feb 2010 17:13:48 +0000 (09:13 -0800)]
Merge "DO NOT MERGE" into eclair
Dirk Dougherty [Wed, 10 Feb 2010 02:44:52 +0000 (18:44 -0800)]
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
Change-Id: I63f881739352d91d296c5c07432eeda74b22000a
Dirk Dougherty [Wed, 10 Feb 2010 02:41:32 +0000 (18:41 -0800)]
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Dirk Dougherty [Mon, 8 Feb 2010 18:53:12 +0000 (10:53 -0800)]
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Change-Id: Idbeda9a677c9772a8348146fe028083d9887a9d2
Grace Kloba [Tue, 2 Feb 2010 19:17:55 +0000 (11:17 -0800)]
DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,39258 from master
Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.
Fix http://b/issue?id=
2413364
Adam Powell [Tue, 9 Feb 2010 18:27:48 +0000 (10:27 -0800)]
Cleanup fixes for ScaleGestureDetector
Suchi Amalapurapu [Tue, 9 Feb 2010 00:30:06 +0000 (16:30 -0800)]
Add null checks when scanning a package.
Delete packages whose code and resource paths haven't been set
correctly.
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Eric Laurent [Tue, 2 Feb 2010 17:42:33 +0000 (09:42 -0800)]
Fix issue:
2413494: [Passion-c] Add TTY support.
Handle TTY mode change events received by HeadsetObserver and send information down to AudioHardware with AudioManager.setParameters()
Use setting "tty_mode_uses_heaset_events" in core config.xml to indicate if the product uses this particular
method of indicating the TTY mode change.
Katie McCormick [Thu, 4 Feb 2010 00:52:18 +0000 (16:52 -0800)]
Merge "SDK doc change: Fixed typo--fingure->finger Bug:
1993220" into eclair
Katie McCormick [Thu, 4 Feb 2010 00:37:15 +0000 (16:37 -0800)]
SDK doc change: Fixed typo--fingure->finger
Bug:
1993220
Scott Main [Thu, 4 Feb 2010 00:11:41 +0000 (16:11 -0800)]
Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Scott Main [Tue, 12 Jan 2010 20:14:52 +0000 (12:14 -0800)]
docs: revise the Style and Themes document to improve the
clarity of the concepts and expand the available information
Megha Joshi [Wed, 3 Feb 2010 20:24:20 +0000 (12:24 -0800)]
Merge "Screenshots for sample syncadapter." into eclair
Megha Joshi [Wed, 27 Jan 2010 23:31:56 +0000 (15:31 -0800)]
Screenshots for sample syncadapter.
Mike Lockwood [Sat, 30 Jan 2010 04:09:16 +0000 (20:09 -0800)]
Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
John Wang [Sat, 30 Jan 2010 04:07:14 +0000 (20:07 -0800)]
Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
John Wang [Fri, 29 Jan 2010 08:21:46 +0000 (00:21 -0800)]
Handle RIL_UNSOL_RESEND_INCALL_MUTE.
For bug
2400052.
Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
Jim Miller [Sat, 30 Jan 2010 01:25:26 +0000 (17:25 -0800)]
Fix
2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Updated javadoc.
The Android Open Source Project [Fri, 29 Jan 2010 22:09:16 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
Scott Main [Fri, 29 Jan 2010 21:40:53 +0000 (13:40 -0800)]
Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Scott Main [Fri, 29 Jan 2010 18:28:18 +0000 (10:28 -0800)]
docs: update web page debugging with info about page and line
numbering in the log.
Mike Lockwood [Fri, 29 Jan 2010 14:20:06 +0000 (09:20 -0500)]
Ignore NTP time fixes that differ from system time by more than 5 minutes.
Change-Id: I603195f6925e25baccd18190016cf8611bb9dc1b
BUG:
2402380
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Fri, 29 Jan 2010 01:59:24 +0000 (17:59 -0800)]
Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Dirk Dougherty [Fri, 29 Jan 2010 01:50:10 +0000 (17:50 -0800)]
SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Bug:
2160782
Change-Id: I6e7721bca95cdc6565f3200d7609a4ea9b45cf9b
Dirk Dougherty [Fri, 29 Jan 2010 00:40:56 +0000 (16:40 -0800)]
Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Dirk Dougherty [Sat, 23 Jan 2010 00:52:34 +0000 (16:52 -0800)]
SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Bug:
2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
Grace Kloba [Wed, 27 Jan 2010 18:52:47 +0000 (10:52 -0800)]
Fix http://b/issue?id=
2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
Dirk Dougherty [Wed, 27 Jan 2010 02:00:29 +0000 (18:00 -0800)]
Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Dirk Dougherty [Wed, 27 Jan 2010 00:58:33 +0000 (16:58 -0800)]
doc change only: Update announcement and mwc redirect to point to microsite.
Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
Jim Miller [Tue, 26 Jan 2010 20:17:46 +0000 (12:17 -0800)]
Fix
2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Robert Greenwalt [Tue, 26 Jan 2010 01:54:29 +0000 (17:54 -0800)]
Fix the reporting of NO_CONNECTIVITY.
A refactoring of handleDisconnect instroduced a bug - we were reporting
NO_CONNECTIVITY after any non-primary network (supl, mms, hipri) was lost.
bug:
2395006
Change-Id: Ifa9e008872ec646981a35f2c316120cb9685a6a4
Robert Greenwalt [Tue, 26 Jan 2010 00:50:10 +0000 (16:50 -0800)]
Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair
Robert Greenwalt [Tue, 26 Jan 2010 00:14:00 +0000 (16:14 -0800)]
Refine fix I53e91db7 to apply only to wifi network
The original fix eliminated duplicate wifi connectivity changes stemming from
location provder scan's for APs. These would generate two DISCONNECTED broadcasts every
two minutes and many apps mis-interpreted them.
The fix was to ignore notifications where the major state was the same as the previous one
for each network. Unfortunately the state of per-apn notifications on cellular is hacky
and so the wifi fix was breaking mms (mms when you're on cellular with a common default+mms apn does
not generate a disconnect notification (apn still connected) so subsequent connect notifications
get dropped as duplicates).
This change refines the previous change so that it only applies to wifi networks.
bug:
2392061
Change-Id: I05d8a46a4b55f8d28df8af12e05284e5e68bfc02
drno: ryanpc
Scott Main [Mon, 25 Jan 2010 23:39:46 +0000 (15:39 -0800)]
Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug:
1909300" into eclair
Scott Main [Mon, 25 Jan 2010 22:47:46 +0000 (14:47 -0800)]
docs: reference the history JS file with docRoot in order to
make offline doc searches work. (I think this was a regression
due to a missed merge.)
Bug:
1909300
Mike Reed [Mon, 25 Jan 2010 14:19:17 +0000 (06:19 -0800)]
Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Mike Reed [Mon, 25 Jan 2010 13:30:35 +0000 (08:30 -0500)]
disable high-quality filtering during scrolling, until I can cached the scaled images.
Jim Miller [Sat, 23 Jan 2010 04:19:12 +0000 (20:19 -0800)]
Merge "Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Jim Miller [Sat, 23 Jan 2010 03:09:50 +0000 (19:09 -0800)]
Fix
2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
Dirk Dougherty [Sat, 23 Jan 2010 00:45:58 +0000 (16:45 -0800)]
Merge "SDK doc change: Misc small fixes." into eclair
Dirk Dougherty [Sat, 23 Jan 2010 00:38:59 +0000 (16:38 -0800)]
Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Dianne Hackborn [Fri, 22 Jan 2010 23:47:08 +0000 (15:47 -0800)]
Merge "Fix issue #
2391429: Crash during boot if fwd locked app is incompletely installed" into eclair
Dirk Dougherty [Tue, 12 Jan 2010 00:16:36 +0000 (16:16 -0800)]
SDK doc change: Misc small fixes.
Bug:
2160782
Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
Dianne Hackborn [Fri, 22 Jan 2010 22:46:21 +0000 (14:46 -0800)]
Fix issue #
2391429: Crash during boot if fwd locked app is incompletely installed
We need to remove left-over .apk when cleaning up a partially installed app.
Change-Id: I94264549670a2ad01622f746c40c82c30dd3da8d
Dirk Dougherty [Wed, 13 Jan 2010 01:54:25 +0000 (17:54 -0800)]
SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
Bug:
2160782
Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
Dirk Dougherty [Fri, 22 Jan 2010 22:23:39 +0000 (14:23 -0800)]
Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
Dirk Dougherty [Wed, 20 Jan 2010 23:38:33 +0000 (15:38 -0800)]
doc change: add announce for developer lab at mwc. move adc to carousel.
Bug:
2160782
Change-Id: I657738d9452058a2078d81d65b5747b1676a3230
John Wang [Fri, 22 Jan 2010 21:17:25 +0000 (13:17 -0800)]
Merge "Updated emergency string when locale changes." into eclair
John Wang [Fri, 22 Jan 2010 20:32:40 +0000 (12:32 -0800)]
Updated emergency string when locale changes.
For bug
2352094.
Grace Kloba [Fri, 22 Jan 2010 20:38:50 +0000 (12:38 -0800)]
Eric Laurent [Fri, 22 Jan 2010 18:14:26 +0000 (10:14 -0800)]
Merge "Fix issue
2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
Eric Laurent [Fri, 22 Jan 2010 15:50:58 +0000 (07:50 -0800)]
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.
John Wang [Fri, 22 Jan 2010 01:44:09 +0000 (17:44 -0800)]
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.
Fred Quintana [Fri, 22 Jan 2010 01:30:07 +0000 (17:30 -0800)]
Merge "initialize sync adapters that get installed while the system is running bug b/issue?id=
2360782" into eclair
jsh [Fri, 22 Jan 2010 00:58:17 +0000 (16:58 -0800)]
Fix NPE when importing from USIM.
Need to check if fileIds is empty.
b/
2349232
Yu Shan Emily Lau [Thu, 21 Jan 2010 23:07:51 +0000 (15:07 -0800)]
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
Eric Fischer [Thu, 21 Jan 2010 21:52:09 +0000 (13:52 -0800)]
Pull in "emergency calls only" translations.
John Wang [Thu, 21 Jan 2010 21:38:32 +0000 (13:38 -0800)]
Merge "Add Emergency Calls Only String." into eclair
Fred Quintana [Thu, 21 Jan 2010 21:14:49 +0000 (13:14 -0800)]
initialize sync adapters that get installed while the system is running
bug http://b/issue?id=
2360782
John Wang [Thu, 21 Jan 2010 20:46:01 +0000 (12:46 -0800)]
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.
Yu Shan Emily Lau [Thu, 21 Jan 2010 20:38:02 +0000 (12:38 -0800)]
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.
Wei Huang [Thu, 21 Jan 2010 20:21:11 +0000 (12:21 -0800)]
Merge "fix bug
2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Wei Huang [Thu, 21 Jan 2010 10:51:34 +0000 (02:51 -0800)]
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
Ying Wang [Thu, 21 Jan 2010 19:07:14 +0000 (11:07 -0800)]
Merge "Find layout classes in all "layout-*" dirs." into eclair
Robert Greenwalt [Thu, 21 Jan 2010 17:57:46 +0000 (09:57 -0800)]
Merge "Try to switch to another default net on connection failure." into eclair
Irfan Sheriff [Thu, 21 Jan 2010 15:46:49 +0000 (07:46 -0800)]
Merge "Use MCC value to always override channel count setting" into eclair
Grace Kloba [Thu, 21 Jan 2010 07:30:05 +0000 (23:30 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Thu, 21 Jan 2010 07:06:43 +0000 (23:06 -0800)]
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.
Ying Wang [Thu, 21 Jan 2010 06:12:46 +0000 (22:12 -0800)]
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.
Grace Kloba [Sun, 17 Jan 2010 07:01:38 +0000 (23:01 -0800)]
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
Nick Pelly [Thu, 21 Jan 2010 04:43:54 +0000 (20:43 -0800)]
Merge "Fix failure to open AVRCP input device due to EPERM." into eclair
Nick Pelly [Thu, 21 Jan 2010 03:36:49 +0000 (19:36 -0800)]
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
Robert Greenwalt [Thu, 21 Jan 2010 03:29:41 +0000 (19:29 -0800)]
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
Grace Kloba [Thu, 21 Jan 2010 01:38:18 +0000 (17:38 -0800)]
DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.
Fix http://b/issue?id=
2385061
Mike Reed [Thu, 21 Jan 2010 02:32:32 +0000 (18:32 -0800)]
Merge "Do not merge" into eclair