OSDN Git Service
Philip Milne [Fri, 5 Aug 2011 18:32:20 +0000 (11:32 -0700)]
Merge "Remove call to setPadding() in setUseDefaultMargins()."
Amith Yamasani [Fri, 5 Aug 2011 18:02:55 +0000 (11:02 -0700)]
Merge "Don't change system sound defaults for upgrades."
Martijn Coenen [Fri, 5 Aug 2011 17:41:10 +0000 (10:41 -0700)]
Merge "Add Android app RTD type and convenience method."
Adam Powell [Fri, 5 Aug 2011 17:29:49 +0000 (10:29 -0700)]
Merge "Fix bug
5111513 - Spinner asset updates for action bars"
Daniel Sandler [Fri, 5 Aug 2011 17:23:22 +0000 (10:23 -0700)]
Merge "Fix crash in log message."
Irfan Sheriff [Fri, 5 Aug 2011 17:21:51 +0000 (10:21 -0700)]
Merge "Update scanresult capability check"
Daniel Sandler [Fri, 5 Aug 2011 15:45:55 +0000 (08:45 -0700)]
Merge "Stop popping up the compatibility mode dialog all the time."
Steve Block [Fri, 5 Aug 2011 14:53:11 +0000 (07:53 -0700)]
Merge "Improve a network error description"
Svetoslav Ganov [Fri, 5 Aug 2011 11:59:04 +0000 (04:59 -0700)]
Merge "ACTION_HOVER_EXIT sometimes not delivered during touch exploration."
Svetoslav Ganov [Fri, 5 Aug 2011 11:57:24 +0000 (04:57 -0700)]
Merge "AccessibilityEvent#toString() always reports -1 for record count."
Daniel Sandler [Fri, 5 Aug 2011 11:46:09 +0000 (04:46 -0700)]
Merge "Clear all notifications on tablet actually works now."
Daniel Sandler [Fri, 5 Aug 2011 11:45:53 +0000 (04:45 -0700)]
Merge "Instrumentation to track notification panel touch bugs."
satok [Fri, 5 Aug 2011 10:59:06 +0000 (03:59 -0700)]
Merge "API cleanup for the spell checker framework"
Jim Miller [Fri, 5 Aug 2011 06:26:48 +0000 (23:26 -0700)]
Merge "Fix
5117544: Fix crash in KeyguardStatusViewManager when resId==0"
Daniel Sandler [Fri, 5 Aug 2011 02:15:49 +0000 (19:15 -0700)]
Merge "Fix another NPE."
The Android Open Source Project [Fri, 5 Aug 2011 01:46:02 +0000 (18:46 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I4ef90a9d38940c8484c030056157a99a103f6aa9
Tsu Chiang Chuang [Fri, 5 Aug 2011 01:34:53 +0000 (18:34 -0700)]
Merge "Bandwidth microbenchmark test app for ICS."
Adam Powell [Fri, 5 Aug 2011 01:32:18 +0000 (18:32 -0700)]
Merge "Fix bug
5118908 - ImageView.setImageDrawable always requests layout"
Amith Yamasani [Fri, 5 Aug 2011 01:25:32 +0000 (18:25 -0700)]
Merge "Don't call onQueryTextChanged more often than necessary."
Jim Miller [Fri, 5 Aug 2011 01:06:03 +0000 (18:06 -0700)]
Merge "Fix
5045008: replace "ring/silence" target in LockScreen with camera app"
Jeff Sharkey [Fri, 5 Aug 2011 00:33:19 +0000 (17:33 -0700)]
Merge "Data cycle ends on last second of month."
Gloria Wang [Thu, 4 Aug 2011 23:32:10 +0000 (16:32 -0700)]
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug
5015079."
Chet Haase [Thu, 4 Aug 2011 22:47:21 +0000 (15:47 -0700)]
Merge "Fix AnimatorSet cancellation issues"
Jeff Sharkey [Thu, 4 Aug 2011 22:39:24 +0000 (15:39 -0700)]
Merge "Network stats with varint, omit parcel fields."
Steve Block [Thu, 4 Aug 2011 22:36:04 +0000 (15:36 -0700)]
am
03f8fcb8: (-s ours) am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
03f8fcb8b017556df08d9926f8ca41b383c5ad08':
Cherry-pick DeviceMotionService CL from master [do not merge]
Irfan Sheriff [Thu, 4 Aug 2011 22:34:47 +0000 (15:34 -0700)]
Merge "Rewrote DnsPinger - now is async and concurrant"
Gloria Wang [Thu, 4 Aug 2011 22:33:12 +0000 (15:33 -0700)]
Merge "resolved conflicts for merge of
845fdba7 to master"
Andreas Huber [Thu, 4 Aug 2011 22:20:24 +0000 (15:20 -0700)]
Merge "Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer"
Gloria Wang [Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)]
resolved conflicts for merge of
845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
Steve Block [Thu, 4 Aug 2011 21:49:44 +0000 (14:49 -0700)]
am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
Cherry-pick DeviceMotionService CL from master [do not merge]
Gloria Wang [Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)]
am
8a6fb50d: am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:36:45 +0000 (14:36 -0700)]
am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:33:06 +0000 (14:33 -0700)]
am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
e15a73ee4c9a28d89888095c7649a70c116ee160':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:20:53 +0000 (14:20 -0700)]
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
Jean-Michel Trivi [Thu, 4 Aug 2011 21:10:57 +0000 (14:10 -0700)]
Merge "Remove empty remote control client listener methods"
Adam Powell [Thu, 4 Aug 2011 20:21:07 +0000 (13:21 -0700)]
Merge "Fix bug
5121406 - ActionBar.setLogo"
Chia-chi Yeh [Thu, 4 Aug 2011 20:04:51 +0000 (13:04 -0700)]
Merge "VPN: move away from the VPN permission."
Andreas Huber [Thu, 4 Aug 2011 19:57:45 +0000 (12:57 -0700)]
Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the"
Xavier Ducrohet [Thu, 4 Aug 2011 19:56:46 +0000 (12:56 -0700)]
am
23ce76ce: am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
23ce76ce1666e5e8b0b17825c271b133ba2626d6':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:54:49 +0000 (12:54 -0700)]
am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
320834c9e02364b39b98b610f1d2244cbb9a4f26':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:52:34 +0000 (12:52 -0700)]
am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
b9e8b25e9066d6f2da0635eaac524246b729fbfa':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:50:11 +0000 (12:50 -0700)]
am
6b3a0123: Merge "Insert a break wraparound."
* commit '
6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:36:11 +0000 (12:36 -0700)]
Merge "Insert a break wraparound."
Xavier Ducrohet [Thu, 4 Aug 2011 19:18:17 +0000 (12:18 -0700)]
Merge "Layoutlib: implement Resources.getBoolean(int)."
Adam Powell [Thu, 4 Aug 2011 17:51:57 +0000 (10:51 -0700)]
Merge "Fix bug
5073637 - Market apps crashing FastScroller"
Irfan Sheriff [Thu, 4 Aug 2011 17:29:23 +0000 (10:29 -0700)]
Merge "Fix p2p package paths"
Fabrice Di Meglio [Thu, 4 Aug 2011 17:09:24 +0000 (10:09 -0700)]
Merge "Fix bug #
5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR"
Daniel Sandler [Thu, 4 Aug 2011 16:56:53 +0000 (09:56 -0700)]
Merge "Log some signal condition diagnostics for now."
Daniel Sandler [Thu, 4 Aug 2011 16:46:45 +0000 (09:46 -0700)]
Merge "Crushing Dreams."
Mike Lockwood [Thu, 4 Aug 2011 16:46:09 +0000 (09:46 -0700)]
Merge "Resolve merge conflict for '
75f1fdec':"
Russell Brenner [Thu, 4 Aug 2011 16:41:53 +0000 (09:41 -0700)]
Merge "Adapt TextLayoutCache for new Harfbuzz scripts"
Debashish Chatterjee [Thu, 4 Aug 2011 16:34:25 +0000 (09:34 -0700)]
Merge "Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base."
Daniel Sandler [Thu, 4 Aug 2011 15:46:20 +0000 (08:46 -0700)]
Merge "Fix NPE on first-ever boot if display has rotated."
Daniel Sandler [Thu, 4 Aug 2011 15:44:51 +0000 (08:44 -0700)]
Merge "Restore DISABLE_NOTIFICATION_ICONS."
Mike Lockwood [Thu, 4 Aug 2011 15:40:25 +0000 (11:40 -0400)]
Resolve merge conflict for '
75f1fdec':
GPS Provider Service changes
GPS engine needs to receive network state changes from Android fw.
Added db query for the current APN, also added a new parameter
between JNI / HAL to the new method in AGpsRilInterface struct
for gps engine to receive APN from GPSLocationService
Conflicts:
services/java/com/android/server/location/GpsLocationProvider.java
Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Thu, 4 Aug 2011 14:53:53 +0000 (07:53 -0700)]
am
0b3af353: am
a82ee49a: am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
0b3af353dcf61177158934a11404cf2914038696':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:51:38 +0000 (07:51 -0700)]
am
a82ee49a: am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:48:57 +0000 (07:48 -0700)]
am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:39:03 +0000 (07:39 -0700)]
Merge "GPS Provider Service changes"
Svetoslav Ganov [Thu, 4 Aug 2011 12:55:46 +0000 (05:55 -0700)]
Merge "Removing firing of spurious scroll accesibility events."
Svetoslav Ganov [Thu, 4 Aug 2011 12:55:26 +0000 (05:55 -0700)]
Merge "No selection or click accessibility events are fired when a list item is tapped."
Wu-cheng Li [Thu, 4 Aug 2011 08:46:56 +0000 (01:46 -0700)]
Merge "Add camera bayer image format."
Jim Miller [Thu, 4 Aug 2011 02:41:45 +0000 (19:41 -0700)]
Merge "Fix
5044158: layout and asset work on lockscreen PIN mode"
Dianne Hackborn [Thu, 4 Aug 2011 01:58:04 +0000 (18:58 -0700)]
Merge "Whoops also need to move notification shade above lock screen."
Mike Lockwood [Thu, 4 Aug 2011 01:35:33 +0000 (18:35 -0700)]
Merge "UsbDeviceManager: Fix typo that broke adb on/off setting persistence"
Mike Lockwood [Thu, 4 Aug 2011 01:35:23 +0000 (18:35 -0700)]
Merge "Add support for localizing order of day of week and date in status bar date view"
Jaikumar Ganesh [Thu, 4 Aug 2011 01:15:11 +0000 (18:15 -0700)]
Merge "Fix PAN bug for reverse tethering."
Mathias Agopian [Thu, 4 Aug 2011 01:12:36 +0000 (18:12 -0700)]
Merge changes I689cb0c0,I09603218
* changes:
Add a 'release' method to the SurfaceTexture public Java API
Mark Window-Manager-specific APIs on android.view.Surface as @hide
Jean-Baptiste Queru [Thu, 4 Aug 2011 00:42:20 +0000 (17:42 -0700)]
am
a598d144: am
3a5e36f9: (-s ours) am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
a598d144e8c9722ff83e38cd8a70bc15a00bcdf3':
Fix a compiling error when trying to use setBufferCount
Christopher Tate [Thu, 4 Aug 2011 00:37:56 +0000 (17:37 -0700)]
Merge "Make backup/restore confirmation UI landscape-friendly"
Matthew Xie [Thu, 4 Aug 2011 00:31:11 +0000 (17:31 -0700)]
Merge "Add a timeout for disconnecting devices to recover from error situation"
Chris Craik [Thu, 4 Aug 2011 00:29:03 +0000 (17:29 -0700)]
Merge "TileBenchmark label addition"
Mathias Agopian [Wed, 3 Aug 2011 22:18:36 +0000 (15:18 -0700)]
Add a 'release' method to the SurfaceTexture public Java API
Bug:
5063618
Change-Id: I689cb0c01c14e597ccfb4eb0972e64fa570bd4e8
Jaikumar Ganesh [Thu, 4 Aug 2011 00:20:52 +0000 (17:20 -0700)]
Merge "Enforce permission for changeApplicationState function."
Romain Guy [Thu, 4 Aug 2011 00:16:02 +0000 (17:16 -0700)]
Merge "Added Device Default Themes."
Kenny Root [Thu, 4 Aug 2011 00:09:38 +0000 (17:09 -0700)]
Merge "Better error codes for missing files"
Jeff Sharkey [Thu, 4 Aug 2011 00:05:21 +0000 (17:05 -0700)]
Merge "Expose quota status for active network."
Adam Powell [Wed, 3 Aug 2011 23:57:07 +0000 (16:57 -0700)]
Merge "Fix bug
5044737 - Compatibility menus should be as wide as the screen width"
Romain Guy [Wed, 3 Aug 2011 23:23:35 +0000 (16:23 -0700)]
Merge "Destroy the EGL surface when the ViewRootImpl surface is invalid Bug #
5109839"
Philip Milne [Wed, 3 Aug 2011 23:01:59 +0000 (16:01 -0700)]
Merge "Tidy."
Chia-chi Yeh [Wed, 3 Aug 2011 22:53:43 +0000 (15:53 -0700)]
Merge "NativeDaemonConnector: offload callbacks to another thread."
Gloria Wang [Wed, 3 Aug 2011 22:37:24 +0000 (15:37 -0700)]
Merge "Check the syncword for each frame. Fix for bug
5117233."
Gilles Debunne [Wed, 3 Aug 2011 22:01:50 +0000 (15:01 -0700)]
Merge "A tap on the insertion handle is only handled if it has not been moved"
Dianne Hackborn [Wed, 3 Aug 2011 21:01:55 +0000 (14:01 -0700)]
Merge "Put back the status bar animations."
Gilles Debunne [Wed, 3 Aug 2011 20:58:49 +0000 (13:58 -0700)]
Merge "Bug
5050963: Suggestion popup moves with its associated TextView"
Adam Powell [Wed, 3 Aug 2011 19:16:58 +0000 (12:16 -0700)]
Merge "Fix bug
5093394 - Double SearchView!! What does it mean!?"
Eric Laurent [Wed, 3 Aug 2011 18:51:55 +0000 (11:51 -0700)]
Merge "AudioService: ignore NOTIFICATIONS_USE_RING_VOLUME."
Eric Laurent [Wed, 3 Aug 2011 18:51:35 +0000 (11:51 -0700)]
Merge "AudioFlinger: disable AEC and NS with BT headsets"
Jaikumar Ganesh [Wed, 3 Aug 2011 18:16:18 +0000 (11:16 -0700)]
Merge "Fix PAN bugs."
Romain Guy [Wed, 3 Aug 2011 18:16:01 +0000 (11:16 -0700)]
Merge "Don't recreate the EGL surface if the surface is not ready Bug #
5114545"
Steve Block [Wed, 3 Aug 2011 17:48:07 +0000 (10:48 -0700)]
Merge "In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering."
Eric Laurent [Wed, 3 Aug 2011 17:38:04 +0000 (10:38 -0700)]
Merge "Audio Effect Framework: add effect suspend/restore"
Chris Craik [Wed, 3 Aug 2011 16:46:15 +0000 (09:46 -0700)]
Merge "Added automated performance test to TileBenchmark"
Jean-Michel Trivi [Wed, 3 Aug 2011 16:09:43 +0000 (09:09 -0700)]
Merge "Remote control display API and implementation"
Debashish Chatterjee [Wed, 3 Aug 2011 13:06:30 +0000 (06:06 -0700)]
Merge "Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS."
Dianne Hackborn [Wed, 3 Aug 2011 05:48:16 +0000 (22:48 -0700)]
Merge "Reduce memory usage of status bar expanded view."
Adam Powell [Wed, 3 Aug 2011 01:44:50 +0000 (18:44 -0700)]
Merge "Fix bug
5098288 - Rethink the suite of new themes"
Mathias Agopian [Wed, 3 Aug 2011 01:31:08 +0000 (18:31 -0700)]
Merge "fix a crasher in surfaceflinger"
Mathias Agopian [Wed, 3 Aug 2011 01:29:51 +0000 (18:29 -0700)]
fix a crasher in surfaceflinger
this would happen if being told to draw before a buffer
was available.
Change-Id: I46d121c73e883078cdbf952063e38b0076f79038
Romain Guy [Wed, 3 Aug 2011 00:34:06 +0000 (17:34 -0700)]
Merge "Paint style and stroke width affect text rendering. Bug #
5112207"