Jeff Sharkey
9916dcfcff
Merge "Only write network stats when already loaded." into ics-mr1
2011-11-17 12:10:02 -08:00
Amith Yamasani
9ae6c9c4d6
Merge "Don't upgrade some settings from GB to ICS." into ics-mr1
2011-11-17 10:01:00 -08:00
Fred Chung
4fe40af10b
Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1
2011-11-17 09:37:15 -08:00
Andreas Huber
7cf8bf90c4
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
2011-11-17 09:05:17 -08:00
John Reck
2e1032de0d
Merge "Fix add single character check" into ics-mr1
2011-11-17 08:48:04 -08:00
John Reck
03503cebdf
Merge "Undeprecate LayoutAlgorithm" into ics-mr1
2011-11-17 08:47:29 -08:00
Ben Murdoch
4c0658c898
Merge changes I59323dc5,I31a01aa3 into ics-mr1
...
* changes:
WebViewDatabase v11 for ICS.
Fix a bug in the database upgrade process, and refactor slightly.
2011-11-17 02:13:19 -08:00
Jeff Sharkey
deca348e76
Merge "Update NTP outside locks, log large trim events." into ics-mr1
2011-11-16 22:59:13 -08:00
Daniel Sandler
795bcc13c7
Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
2011-11-16 22:33:55 -08:00
Daniel Sandler
d54b32aaf3
Merge "Disable desk dock apps." into ics-mr1
2011-11-16 22:33:44 -08:00
Mathias Agopian
410f141622
Merge "be a bit more defensive when parsing extension strings" into ics-mr1
2011-11-16 20:59:30 -08:00
Nicolas Roard
fa5a800da4
Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1
2011-11-16 19:40:04 -08:00
Matthew Xie
d858f05940
Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
2011-11-16 18:20:50 -08:00
Mathias Agopian
20b52631fa
Merge "remove hack that hardcoded the refresh rate" into ics-mr1
2011-11-16 18:19:33 -08:00
Mangesh Ghiware
ae8891278a
Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
2011-11-16 18:01:35 -08:00
satok
517dcd273f
Merge "Clean up the spell checker framework" into ics-mr1
2011-11-16 17:35:54 -08:00
Daniel Sandler
a974a262ee
Merge "Add a default Dreams component." into ics-mr1
2011-11-16 17:13:35 -08:00
Daniel Sandler
c33702f3fb
Merge "Remove day of week from phone notification panel." into ics-mr1
2011-11-16 17:13:16 -08:00
Mathias Agopian
f3ae82d813
be a bit more defensive when parsing extension strings
...
hopefully this will fix a crash in the emulator.
Bug: 5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
2011-11-16 16:49:25 -08:00
Mathias Agopian
c554d2b8ad
Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1
2011-11-16 16:13:38 -08:00
Mathias Agopian
c21180ee67
Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"
...
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.
Seemed to cause failures un SurfaceTexture.
Bug: 5627450
2011-11-16 15:59:13 -08:00
Marco Nelissen
d1ca738ebc
Merge "Change MediaController look b/5584613" into ics-mr1
2011-11-16 14:54:20 -08:00
Dianne Hackborn
41b788368f
Merge "Maybe fix issue #5627399 : java.lang.RuntimeException - While sign in..." into ics-mr1
2011-11-16 14:03:09 -08:00
Robert Greenwalt
b49ade8057
Merge "Fix TelephonyManager to grab the best context" into ics-mr1
2011-11-16 12:06:53 -08:00
Jamie Gennis
c1ef3c4d7d
Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
2011-11-16 11:34:30 -08:00
Eric Fischer
dfc0992233
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-16 10:57:45 -08:00
Gilles Debunne
d5a6b7eb92
Merge "IME action (done, next...) correctly handled" into ics-mr1
2011-11-16 10:31:40 -08:00
Alex Sakhartchouk
982596d4c4
Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1
2011-11-16 09:40:11 -08:00
Fred Chung
4542525a45
Merge "Bluetooth HDP sample." into ics-mr1
2011-11-16 09:31:54 -08:00
The Android Open Source Project
2c707f9bb2
No-op merge from ics-mr0
...
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
2011-11-16 09:28:00 -08:00
The Android Open Source Project
9e566e2616
Reconcile with ics-factoryrom-2-release
...
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
2011-11-16 08:55:43 -08:00
The Android Open Source Project
48792c7415
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
2011-11-16 07:33:59 -08:00
Mathias Agopian
465494486c
remove hack that hardcoded the refresh rate
...
Change-Id: Ibdd40b337c547e80ef8541856015f1380c8d58ed
2011-11-16 00:08:08 -08:00
Jake Hamby
6b78ee140f
am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
...
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
Fix 3GPP SMS send failure for 7-bit national language tables.
2011-11-15 20:16:12 -08:00
Bill Gruber
d9e8a1dca2
am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0
...
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
IAB Doc Fix: Error in code snippet Bug 5221766
2011-11-15 20:16:02 -08:00
Adrian Ludwig
76976f7ec5
am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0
...
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
Adding new "Security Best Practices" to the html docs.
2011-11-15 20:15:57 -08:00
James Dong
54e3cf8e56
Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
2011-11-15 20:13:03 -08:00
Adam Powell
e5705c7f7a
Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
2011-11-15 19:51:56 -08:00
Jeff Brown
032458cbab
Merge "Eliminate hw.keyboards system properties." into ics-mr1
2011-11-15 19:17:09 -08:00
The Android Automerger
98dcfe2647
merge in ics-mr0-release history after reset to ics-mr0
2011-11-15 19:08:44 -08:00
Dianne Hackborn
f81caa67c0
Merge "Whoops, need to acquire lock." into ics-mr1
2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
74266e51cf
Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1
2011-11-15 18:19:34 -08:00
Mathias Agopian
7288f91445
Merge "rework a bit how we manage EGL extensions" into ics-mr1
2011-11-15 18:12:00 -08:00
Jeff Brown
882b0a59d8
Eliminate hw.keyboards system properties.
...
Stop using system properties to publish information about
the key character map path. Instead, we can retrieve it
on demand by asking the window manager.
It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.
Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
2011-11-15 18:00:10 -08:00
Jim Miller
403f92d906
Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1
2011-11-15 15:42:20 -08:00
Tsu Chiang Chuang
6a6ff2015d
am d5897dc7: fix for build breakage.
...
* commit 'd5897dc7985e511c194f839d4b340fed2d63b41c':
fix for build breakage.
2011-11-15 15:00:26 -08:00
Jim Miller
f8d578c485
Merge "Fix 5602985: Show "Emergency calls only" when device has no SIM." into ics-mr1
2011-11-15 14:51:50 -08:00
Jeff Brown
fec867c117
Merge "Override app requested orientation when docked." into ics-mr1
2011-11-15 14:46:17 -08:00
Dianne Hackborn
6410350bc5
Merge "Improve low memory dropbox reporting." into ics-mr1
2011-11-15 14:39:37 -08:00
Jake Hamby
cf56976015
Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0
2011-11-15 13:34:58 -08:00