OSDN Git Service
James Dong [Thu, 15 Sep 2011 00:42:22 +0000 (17:42 -0700)]
Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications"
Adam Powell [Thu, 15 Sep 2011 00:32:37 +0000 (17:32 -0700)]
Merge "Fix bug
5237737 - ActionBar should fire an accessibility event when action mode is turned on/off"
Eric Fischer [Thu, 15 Sep 2011 00:18:59 +0000 (17:18 -0700)]
Merge "Bug
5278473: Add a delete option in the suggestion popup"
Marius Renn [Thu, 15 Sep 2011 00:13:30 +0000 (17:13 -0700)]
Merge "Rename of DoodleEffect as part of cleanup (Bug
5287103)."
Daniel Sandler [Wed, 14 Sep 2011 23:26:22 +0000 (16:26 -0700)]
Merge "Fix disappearing BACK button."
Svetoslav Ganov [Wed, 14 Sep 2011 23:24:21 +0000 (16:24 -0700)]
Merge "AccessibilityManagerService not registered for removed packages."
Dianne Hackborn [Wed, 14 Sep 2011 23:04:15 +0000 (16:04 -0700)]
Merge "ICS is API 14."
Peter Ng [Wed, 14 Sep 2011 22:03:32 +0000 (15:03 -0700)]
Merge "Spinner touchstates now in line with list states"
Irfan Sheriff [Wed, 14 Sep 2011 22:03:26 +0000 (15:03 -0700)]
Merge "Add support to change IPv6 privacy extensions"
Adam Powell [Wed, 14 Sep 2011 21:54:23 +0000 (14:54 -0700)]
Merge "Bug
5151927 - Monkeys should not play with detached lists."
Jaikumar Ganesh [Wed, 14 Sep 2011 21:46:20 +0000 (14:46 -0700)]
Merge "Use an integer for the channel id."
Jaikumar Ganesh [Wed, 14 Sep 2011 21:46:10 +0000 (14:46 -0700)]
Merge "Add Register before boot flag."
Rajneesh Chowdury [Wed, 14 Sep 2011 21:01:36 +0000 (14:01 -0700)]
Merge "Fix for bug
5309242 [Prime] VideoEditorAPITest testVideoContentHD failed"
Robert Greenwalt [Wed, 14 Sep 2011 20:41:10 +0000 (13:41 -0700)]
Merge "Add OTADM feature for Verizon requirement. - GsmDataConnectionTracker.java <in function createApnList> : modify parameter type for new ApnSetting. (carrierEnabled has changed to boolean from integer, BEARER has changed to integer from string). <in function createAllApnList> : modify telephony db query statement using carrierEnabled. (carrier_enabled: 1 enable apn, 0: disabled apn) <in function buildWaitingApns> : modify apn management code when current RAT (radio access technology) is LTE or EHRPD. add internal function named needToCheckApnBearer to check current RAT is LTE or EHRPD. - ApnSetting.java : add two member variable (carrierEnabled: apn enable/disable , bearer : Radio Access Technology) - Telephony.java : add two static string CARRIER_ENABLED & BEARER. - ApnSettingTest.java : add two assertEquals in function assertApnSettingEqual. add CARRIER_ENABLED & BEARER parameters."
Christopher Tate [Wed, 14 Sep 2011 18:34:03 +0000 (11:34 -0700)]
Merge "Give backup/restore confirmation a proper window title"
Svetoslav Ganov [Wed, 14 Sep 2011 18:07:36 +0000 (11:07 -0700)]
Merge "Disable accessibility if all accessibility serivces are disbaled."
Fabrice Di Meglio [Wed, 14 Sep 2011 18:05:04 +0000 (11:05 -0700)]
Merge "Fix some TextLayoutCache issues"
Gilles Debunne [Wed, 14 Sep 2011 18:02:43 +0000 (11:02 -0700)]
Merge "Bug
5295607: IOOB problems in Suggestions"
Matthew Xie [Wed, 14 Sep 2011 17:48:43 +0000 (10:48 -0700)]
Merge "Keep Binder reference in the mServiceRecordToPid hashmap"
Daniel Sandler [Wed, 14 Sep 2011 17:23:21 +0000 (10:23 -0700)]
Merge "When the status bar hides, close the notification panel."
Scott Main [Wed, 14 Sep 2011 16:57:46 +0000 (09:57 -0700)]
Merge "docs: update usb driver directory"
Eric Laurent [Wed, 14 Sep 2011 16:18:23 +0000 (09:18 -0700)]
Merge "Issue
5044873: Pb with BT SCO AudioManager API"
Narayan Kamath [Wed, 14 Sep 2011 16:11:17 +0000 (09:11 -0700)]
Merge "Don't wait indefinitely for audio tracks to finish playing."
Jean-Michel Trivi [Wed, 14 Sep 2011 16:05:36 +0000 (09:05 -0700)]
Merge "Bug
5300223 RemoteControlClient uses PendingIntent"
Justin Ho [Wed, 14 Sep 2011 14:39:56 +0000 (07:39 -0700)]
Merge "Moving tablet unlock screen assets to tablet-specific folders Refreshing visual style to match phone unlock assets Bug:
5231253"
The Android Open Source Project [Wed, 14 Sep 2011 14:22:47 +0000 (07:22 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I2ef7b37dce08a4012ed7ba1704841fb2af846b76
Mike Lockwood [Wed, 14 Sep 2011 14:12:46 +0000 (07:12 -0700)]
Merge "Move Power Manager minimum screen brightness to a framework resource"
Ed Heyl [Wed, 14 Sep 2011 11:28:58 +0000 (04:28 -0700)]
keep history after reset to GRK39D
Jean-Baptiste Queru [Wed, 14 Sep 2011 05:40:47 +0000 (22:40 -0700)]
am
1d6a69f8: Ignore
e4f0da70 from gingerbread-plus-aosp
* commit '
1d6a69f84f8d14dc8bf90f421ad49ea7f4df88b1':
Added interface to SurfaceTexture needed by WebKit.
Adam Powell [Wed, 14 Sep 2011 04:48:33 +0000 (21:48 -0700)]
Merge "Un-force fading edges in ListPopupWindows."
Chia-chi Yeh [Wed, 14 Sep 2011 04:21:18 +0000 (21:21 -0700)]
Merge "RTP: Update parameters for larger packet intervals."
Adam Powell [Wed, 14 Sep 2011 04:13:15 +0000 (21:13 -0700)]
Merge "Fix bug
5314559 - Slow menu scrolling in browser on some devices"
Jeff Brown [Wed, 14 Sep 2011 02:23:01 +0000 (19:23 -0700)]
Merge "Fix bug in KeyButtonView key injection logic. Bug:
5299191 Bug:
5300282"
satok [Wed, 14 Sep 2011 02:11:05 +0000 (19:11 -0700)]
Merge "Skip the exit animation when the IME is destroyed."
Adam Powell [Wed, 14 Sep 2011 01:17:14 +0000 (18:17 -0700)]
Merge "Fix bug
5312352 - ListView modal multi-select mode bugs"
Kenny Root [Wed, 14 Sep 2011 00:51:08 +0000 (17:51 -0700)]
Merge "Add verifier device identity"
Eric Laurent [Wed, 14 Sep 2011 00:50:31 +0000 (17:50 -0700)]
Merge "Issue
5298399: Lost speech after a crash in gTalk."
John Reck [Wed, 14 Sep 2011 00:23:11 +0000 (17:23 -0700)]
Merge "Prevent pause/resuming a destroyed WebViewCore"
Adam Powell [Wed, 14 Sep 2011 00:15:46 +0000 (17:15 -0700)]
Merge "Fix bug
5309557 - Monkeys and SIGSEGV do not mix!"
Siva Velusamy [Wed, 14 Sep 2011 00:10:28 +0000 (17:10 -0700)]
Merge "Minor docs fixes: Make description match screenshot."
John Reck [Tue, 13 Sep 2011 23:55:27 +0000 (16:55 -0700)]
Merge "Make sure the finalizer destroy runs on the UI thread"
Jason Sams [Tue, 13 Sep 2011 23:37:03 +0000 (16:37 -0700)]
Merge "Add RS watchdog."
Adam Powell [Tue, 13 Sep 2011 23:02:38 +0000 (16:02 -0700)]
Merge "Fix bug
5307916 - legacy menu theming"
Dmitry Dolinsky [Tue, 13 Sep 2011 23:01:40 +0000 (16:01 -0700)]
Merge "List path-permission element under provider"
Chia-chi Yeh [Tue, 13 Sep 2011 22:47:46 +0000 (15:47 -0700)]
Merge "VpnDialogs: allow strings wrapped into multiple lines."
Fabrice Di Meglio [Tue, 13 Sep 2011 22:35:06 +0000 (15:35 -0700)]
Merge "Fix bug #
5282141 ScrollView overscroll should not generate invalidations when not needed (ANR textview redraws constantly when touched)"
Justin Ho [Tue, 13 Sep 2011 21:50:02 +0000 (14:50 -0700)]
Merge "Updated default application launcher icon Bug:
5286988"
Christopher Tate [Tue, 13 Sep 2011 21:28:05 +0000 (14:28 -0700)]
Merge "Fix bug
5297302 - Remember to release surface after starting drag"
Robert Greenwalt [Tue, 13 Sep 2011 21:25:27 +0000 (14:25 -0700)]
am
61db35da: am
2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
* commit '
61db35da2b4501dde5646f86f21cf5054c41ea26':
Make copies of NetworkInfo to give out.
Kazuhiro Ondo [Tue, 13 Sep 2011 21:25:23 +0000 (14:25 -0700)]
am
30928eb6: am
b1a3f0ca: Fix no data issue after system server crash
* commit '
30928eb60395ac7c02ac45fd00a0d781ce364856':
Fix no data issue after system server crash
yoonsung.nam [Tue, 13 Sep 2011 21:25:20 +0000 (14:25 -0700)]
am
90cfe5c3: (-s ours) am
37f770f0: DO NOT MERGE: Notify overall state instead of current changed state
* commit '
90cfe5c366c1ffcbd4f9164b9bef998f27912089':
DO NOT MERGE: Notify overall state instead of current changed state
Kazuhiro Ondo [Tue, 13 Sep 2011 21:25:16 +0000 (14:25 -0700)]
am
52d51c42: (-s ours) am
eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants
* commit '
52d51c42b6296a96287dd373558f576c18846a01':
DO NOT MERGE: Fix leak in SIM ready registrants
Attila Bodis [Tue, 13 Sep 2011 21:20:32 +0000 (14:20 -0700)]
Merge "Adding isEmergencyNumber which also takes in a defaultCountryIso."
Dianne Hackborn [Tue, 13 Sep 2011 21:16:59 +0000 (14:16 -0700)]
Merge "Fix issue #
4280324: Returning to Fullscreen Layout with WebView..."
Jason Sams [Tue, 13 Sep 2011 21:11:11 +0000 (14:11 -0700)]
Merge "Cleanup example code."
Jake Hamby [Tue, 13 Sep 2011 20:50:20 +0000 (13:50 -0700)]
Merge "Add method to retrieve MSISDN for CDMA/LTE devices."
Adam Powell [Tue, 13 Sep 2011 20:40:07 +0000 (13:40 -0700)]
Merge "Fix bug
5226097 - App compatibility issues around new ListView fixes"
Dianne Hackborn [Tue, 13 Sep 2011 20:38:17 +0000 (13:38 -0700)]
Merge "Fix issue #
5309443: Ninjump crashes on boot with..."
Eric Laurent [Tue, 13 Sep 2011 19:57:37 +0000 (12:57 -0700)]
Merge "Issue
4345021: Audio routed to multiple devices..."
Gilles Debunne [Tue, 13 Sep 2011 19:38:03 +0000 (12:38 -0700)]
Merge "Bug
5281947: add to dictionnary option promoted in suggestions."
Daniel Sandler [Tue, 13 Sep 2011 19:20:03 +0000 (12:20 -0700)]
Merge "Transparent notification shade."
Andreas Huber [Tue, 13 Sep 2011 18:37:22 +0000 (11:37 -0700)]
Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
Costin Manolache [Tue, 13 Sep 2011 18:21:16 +0000 (11:21 -0700)]
Merge "For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow"
Chia-chi Yeh [Tue, 13 Sep 2011 17:35:04 +0000 (10:35 -0700)]
Merge "SIP: fix keep-alive measurement and increase the timeout."
Mathias Agopian [Tue, 13 Sep 2011 05:17:21 +0000 (22:17 -0700)]
Merge "improve sensorservice_test output"
Daniel Sandler [Tue, 13 Sep 2011 03:26:52 +0000 (20:26 -0700)]
Merge "Fix the takeoff position of a flung windowshade."
Adam Powell [Tue, 13 Sep 2011 02:19:33 +0000 (19:19 -0700)]
Merge "Fix bug
5296851 - Silly monkeys."
Matthew Xie [Tue, 13 Sep 2011 01:30:48 +0000 (18:30 -0700)]
Merge "Fix a compile error when debug is turned on"
Jeff Sharkey [Tue, 13 Sep 2011 01:28:15 +0000 (18:28 -0700)]
Merge "Handle data changed during FlingRunnable."
Adam Powell [Tue, 13 Sep 2011 01:15:37 +0000 (18:15 -0700)]
Merge "Pause WebKit drawing when WebView loses window focus."
Dianne Hackborn [Tue, 13 Sep 2011 00:52:54 +0000 (17:52 -0700)]
Merge "Fix problems where we were allocating TypedArray when not needed."
The Android Automerger [Tue, 13 Sep 2011 00:16:34 +0000 (17:16 -0700)]
keep history after reconcile of gingerbread-release
Svetoslav Ganov [Tue, 13 Sep 2011 00:05:44 +0000 (17:05 -0700)]
Merge "CheckedTextView is missing onInitializeAccessibilityNodeInfo() implementation."
Michael Jurka [Tue, 13 Sep 2011 00:04:53 +0000 (17:04 -0700)]
Merge "Bug fixes in Recents"
Svetoslav Ganov [Mon, 12 Sep 2011 23:58:13 +0000 (16:58 -0700)]
Merge "Adding accessibility delegate mechanism for backwards compatibility support."
Jeff Sharkey [Mon, 12 Sep 2011 23:50:34 +0000 (16:50 -0700)]
Merge "Data usage structure optimizations."
Amith Yamasani [Mon, 12 Sep 2011 23:46:58 +0000 (16:46 -0700)]
Merge "Use a new config flag to decide if notification led pulsing can be turned on/off."
Chet Haase [Mon, 12 Sep 2011 22:17:32 +0000 (15:17 -0700)]
Merge "Fix wobbly spinners"
Dianne Hackborn [Mon, 12 Sep 2011 22:07:51 +0000 (15:07 -0700)]
Merge "Add boot mode where only "core apps" are started."
Jeff Brown [Mon, 12 Sep 2011 21:50:38 +0000 (14:50 -0700)]
Merge "Track status bar fling velocity using screen coords. Bug:
5210198"
Jeff Brown [Mon, 12 Sep 2011 21:50:31 +0000 (14:50 -0700)]
Merge "Fix ACTION_CANCEL handling in status bar. Bug:
5198231"
Dianne Hackborn [Mon, 12 Sep 2011 21:42:02 +0000 (14:42 -0700)]
Merge "Get rid of some animation flickers and other bad things."
Andreas Huber [Mon, 12 Sep 2011 21:21:42 +0000 (14:21 -0700)]
Merge "Turn an another assertion into a runtime error in ACodec's implementation"
Christopher Tate [Mon, 12 Sep 2011 21:19:15 +0000 (14:19 -0700)]
Merge "Move full backup/restore onto dedicated threads"
Andreas Huber [Mon, 12 Sep 2011 20:59:11 +0000 (13:59 -0700)]
Merge "Increase the avi extractor's confidence slighly over mp3's"
Gilles Debunne [Mon, 12 Sep 2011 20:30:26 +0000 (13:30 -0700)]
Merge "If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up."
Romain Guy [Mon, 12 Sep 2011 20:16:28 +0000 (13:16 -0700)]
Merge "Turn hinting back on"
Stephen Hines [Mon, 12 Sep 2011 19:47:12 +0000 (12:47 -0700)]
Merge "Add simple test for reference counting."
Stephen Hines [Mon, 12 Sep 2011 19:47:07 +0000 (12:47 -0700)]
Merge "Add int and missing fp tests to RSTest."
Irfan Sheriff [Mon, 12 Sep 2011 19:24:05 +0000 (12:24 -0700)]
Merge "Emergency callback mode handling"
Fred Quintana [Mon, 12 Sep 2011 19:17:54 +0000 (12:17 -0700)]
Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""
Jeff Brown [Mon, 12 Sep 2011 18:26:58 +0000 (11:26 -0700)]
Merge "Handle DOWN/MOVE/UP gestures with fling. Bug:
5265814"
Gilles Debunne [Mon, 12 Sep 2011 18:19:06 +0000 (11:19 -0700)]
Merge "The back key stops selection mode in extracted text mode."
Eric Fischer [Mon, 12 Sep 2011 17:22:21 +0000 (10:22 -0700)]
Merge "Import revised translations."
Daniel Sandler [Mon, 12 Sep 2011 17:06:53 +0000 (10:06 -0700)]
Merge "Hide navigation buttons when they are DISABLEd."
Mangesh Ghiware [Mon, 12 Sep 2011 16:46:49 +0000 (09:46 -0700)]
Merge "On zoom to overview, reflow text, if necessary."
Jaikumar Ganesh [Mon, 12 Sep 2011 16:45:20 +0000 (09:45 -0700)]
Merge "Don't override the hash code for the channel."
The Android Open Source Project [Mon, 12 Sep 2011 14:46:51 +0000 (07:46 -0700)]
Reconcile with gingerbread-release
Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c
Jean-Baptiste Queru [Mon, 12 Sep 2011 14:22:49 +0000 (07:22 -0700)]
Ignore
e4f0da70 from gingerbread-plus-aosp
Change-Id: I375563d4665ccb1948b17266afdc9c26cc7a7e35
satok [Mon, 12 Sep 2011 07:25:41 +0000 (00:25 -0700)]
Merge "Fix the visiblity of the ime switcher icon."