60468 Commits

Author SHA1 Message Date
Michael Chan
63aa6622d0 Merge "Fix typos" 2011-10-20 15:42:30 -07:00
Adam Powell
97e1836e1b Bug 5275928 - Invasion of the monkeys
Fix a monkey bug where runnables set to open popup windows were being
left around.

Change-Id: I29f2c7763ab667c784b96b60ef0d7e04d358c4d9
2011-10-20 15:38:05 -07:00
Gilles Debunne
c5d6fe0152 Merge "Renaming of a hidden API: ShowSoftInputOnFocus" 2011-10-20 15:35:34 -07:00
Gilles Debunne
972b7d2c3b Merge "Typo in ViewRootImpl" 2011-10-20 15:35:20 -07:00
Gilles Debunne
f09c150232 Merge "Wrong word cut at end of lines with spaces" 2011-10-20 15:35:12 -07:00
Michael Chan
cf0ca99a22 Fix typos
Change-Id: I6406b33f52bd8fb126a9b346d1bfe30ca2c2144b
http://code.google.com/p/android/issues/detail?id=14614
http://code.google.com/p/android/issues/detail?id=3563
http://code.google.com/p/android/issues/detail?id=5960
2011-10-20 15:32:37 -07:00
Irfan Sheriff
995fe182f7 am 2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0
* commit '2159927f366fd8a617128df60865923e131cad7b':
  Fix handling in DisconnectingState
2011-10-20 15:07:46 -07:00
Irfan Sheriff
2159927f36 Merge "Fix handling in DisconnectingState" into ics-mr0 2011-10-20 15:05:07 -07:00
Irfan Sheriff
2d57d860c2 Fix handling in DisconnectingState
Now that we also handle supplicant state change to identify that
a network is disconnected (in case CTRL-EVENT-DISCONNECTED goes missing),
it is dangerous to defer all supplicant state change messages
while in DisconnectingState.

It may happen that the CTRL-EVENT-DISCONNECTED goes missing while in
DisconnectingState resulting in a supplicant state change of 0 (disconnect)
getting deferred.

Eventually after a connection completes, the supplicant state change events
get handled and the state machine goes into DisconnectedState.

Fix by having state machine switch out of DisconnectingState once we
do not immediately see a CTRL-EVENT-DISCONNECTED state.

Bug: 5490789
Change-Id: Ia2263795e53c51da0a2bfeefecfeb6256d6c5267
2011-10-20 14:38:54 -07:00
Dirk Dougherty
fe14c2fccb am 957ad44e: Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
* commit '957ad44e9c6f1415dae85a0177d37c3a69f1e955':
  Doc change: minor fixes to ICS highlights.
2011-10-20 14:34:50 -07:00
Dirk Dougherty
957ad44e9c Merge "Doc change: minor fixes to ICS highlights." into ics-mr0 2011-10-20 14:32:19 -07:00
Svetoslav Ganov
c8c2e17ecd Merge "Add content description setter to RemoteViews" 2011-10-20 14:29:18 -07:00
Dirk Dougherty
685ce06721 Doc change: minor fixes to ICS highlights.
Change-Id: I879ee08b9834fc911fb5055bb627a3e245b70d56
2011-10-20 14:20:36 -07:00
Jason Sams
79235d2a93 Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff." 2011-10-20 13:54:37 -07:00
Jason Sams
5b6f23868a Merge "Remove ObjBaseRef from the hal struct" 2011-10-20 13:52:43 -07:00
Jason Sams
981d13291e Merge "Fixes and optimizations of two quaternion functions." 2011-10-20 13:49:59 -07:00
Peter Ng
002a71e146 Sharpening text edit assets
Change-Id: I72db9a1c8981169f3bea50bd3e72fadcc682cfe7
2011-10-20 13:32:54 -07:00
Jim Miller
214406a8e9 Fix 3384942: Force ASCII-capable IME to show on lockscreen
Only Latin-1 based passwords are supported on the system at
this point.  As such, we need a way to show a Latin-1-compliant
keyboard when unlocking the device.

It is expected that 3rd party IMEs honor this mode for Latin-1
password dialogs. If not, this change will cause lockscreen to
revert to using the Android system IME for entering the password.

Change-Id: I59bb56f6f5968b5abc50cf1b9b26c19ca4f183e4
2011-10-20 13:32:52 -07:00
Christopher Tate
257e67e44c Merge "Don't inappropriately kill ANRing drop recipients" 2011-10-20 13:21:07 -07:00
Daniel Sandler
8de952bfc1 am d2cd1f72: Merge "Lazily fetch the status bar service." into ics-mr0
* commit 'd2cd1f722421c33e88df92d036663f30b316fa3f':
  Lazily fetch the status bar service.
2011-10-20 13:11:15 -07:00
Daniel Sandler
d2cd1f7224 Merge "Lazily fetch the status bar service." into ics-mr0 2011-10-20 13:08:36 -07:00
Scott Main
017009e01f am b321cd99: docs: fix tools release notes links
* commit 'b321cd99c24272494bb9af5662c18c5bdc507186':
  docs: fix tools release notes links
2011-10-20 13:05:38 -07:00
Scott Main
b321cd99c2 docs: fix tools release notes links
Change-Id: Ie7bee86c5d59e7c7c13bb8870c5514e175767aef
2011-10-20 12:57:43 -07:00
Christopher Tate
05e9c65a53 Don't inappropriately kill ANRing drop recipients
If an app takes the 5-second ANR timeout before responding to a
drop, but then recovers, we were inappropriately throwing an
exception back at it for having acknowledged the drop after we'd
abandoned the operation out from under it.  Now we let such
responses slide without taking any punitive action: the app is
still okay, and the drag/drop operation was cleanly terminated
already anyway.

Bug 5045618

Change-Id: I0b7e76c61f0f8c97e41280b542a470a7d3c8d86f
2011-10-20 12:34:36 -07:00
Eric Fischer
68ddcc9118 am 7ec4284a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '7ec4284ab2026a82e6904a4974db8f947c159960':
  Import revised translations.  DO NOT MERGE
2011-10-20 11:29:19 -07:00
Eric Fischer
7ec4284ab2 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-20 11:25:44 -07:00
Eric Fischer
0d00210f99 Import revised translations. DO NOT MERGE
Change-Id: I2f0393068bfeaaf7d751643355c6ce74a96a2419
2011-10-20 11:07:28 -07:00
Michael Chan
e1aef8ec04 Merge "Update comments for Calendar ExtendedProperties." 2011-10-20 10:51:58 -07:00
Daniel Sandler
ee89393f5f am 0d6ff010: Tune wifi RSSI code (see bug 5241139).
* commit '0d6ff01050af1bc37ee383c9c7ed1b3a3aa775bf':
  Tune wifi RSSI code (see bug 5241139).
2011-10-20 10:50:54 -07:00
Daniel Sandler
0d6ff01050 Tune wifi RSSI code (see bug 5241139).
Bug: 5241139
Change-Id: I3fef432c39f1b33532e48b643bd9268d3df0f864
2011-10-20 13:29:15 -04:00
The Android Open Source Project
5c405feb78 Reconcile with ics-mr0-release
Change-Id: I21c521bc9659ba52a8a48a9f142befa418e0896c
2011-10-20 09:17:09 -07:00
Jesse Hall
d10475e24f Merge "SurfaceTexture: add tests for buffer leaks" 2011-10-20 09:09:31 -07:00
satok
87e87c210e am 1301f092: Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0
* commit '1301f092e5bd520821c54c788a07cbdfda49df7b':
  Update links for SampleSpellCheckerService for I938ba499
2011-10-20 08:44:39 -07:00
satok
1301f092e5 Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0 2011-10-20 08:42:50 -07:00
Justin Ho
50039e395e am 9397f580: Merge "Add louder keypress sounds for different device configurations" into ics-mr0
* commit '9397f5807b5377c5edef99820614694cc7e05160':
  Add louder keypress sounds for different device configurations
2011-10-20 07:29:31 -07:00
Justin Ho
9397f5807b Merge "Add louder keypress sounds for different device configurations" into ics-mr0 2011-10-20 07:25:14 -07:00
Justin Ho
63b47728a4 Add louder keypress sounds for different device configurations
Change-Id: Ib5fe70e7b9d31efd8383e9d3351e33d08a3f7ae6
2011-10-20 07:23:25 -07:00
The Android Automerger
a6d5814923 merge in ics-mr0-release history after reset to ics-mr0 2011-10-20 06:28:24 -07:00
Jean Chalard
b5470d52a4 Merge "Fix a warning from the binder, step 2." 2011-10-20 05:36:26 -07:00
Jean Chalard
a5142a8293 Merge "Fix a warning from the binder, step 3." 2011-10-20 05:26:29 -07:00
Jean Chalard
de9dbb05ce Fix a warning from the binder, step 2.
This patch fixes the following warning:
W/Binder: The following Binder class should be static or
  leaks might occur: android.view.inputmethod
  .InputMethodManager.ControlledInputConnectionWrapper

...in hope of removing a possible memory leaks.

Change-Id: I081d10fd839f2985d7081492f4f5cf0b4da42fd2
Bugs: 5481376, 5461066
2011-10-20 20:55:08 +09:00
Jean Chalard
e0d32a60da Fix a warning from the binder, step 3.
This patch fixes the following warning:
W/Binder: The following Binder class should be static or
  leaks might occur: com.android.server
  .InputMethodManagerService.MethodCallback

...in hope of removing a possible memory leaks.

Bugs: 5481376, 5461066
Change-Id: I1764090a7059d9bf9e5d90683d7ac190c83415de
2011-10-20 20:45:21 +09:00
Jean Chalard
a80838d9d6 Fix a warning from the binder.
This patch fixes the following warning:
W/Binder: The following Binder class should be static or
  leaks might occur: android.view.textservice
  .SpellCheckerSession.InternalListener

...in hope of removing a possible memory leaks.
However in my tests it does nothing at all for the memory leak
in bug 5461066, so it was probably unrelated.

Change-Id: Id776665e9483121d22cc91e8d2d9f32e3413ec96
Bugs: 5481376,5461066
2011-10-20 20:04:54 +09:00
Dave Burke
149a14931e am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
  Stagefright: idle OMX after ANW errors
2011-10-19 22:38:45 -07:00
Dave Burke
23d644202a Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 2011-10-19 22:37:18 -07:00
Winson Chung
c919cd77ee am 44630c72: Merge "Updating the screenshot notification icons." into ics-mr0
* commit '44630c72651803ba1dedba3b5352cad8a8a62ace':
  Updating the screenshot notification icons.
2011-10-19 21:39:31 -07:00
Winson Chung
44630c7265 Merge "Updating the screenshot notification icons." into ics-mr0 2011-10-19 21:36:32 -07:00
Jamie Gennis
6607b39baa Stagefright: idle OMX after ANW errors
This change fixes an issue in Stagefright where the state of an OMXCodec
object can get out of sync with the state of the OMX component.  In
particular, if one of the ANativeWindow functions failed and put the
OMXCodec into the ERROR state, this would cause Stagefright to skip
doing the Executing -> Idle transition.  Without this transition the
freeBuffersOnPort call would never be made, and the MediaBuffers would
end up being leaked (which would also leak the Gralloc buffers they
reference).

Bug: 5333695
Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
2011-10-19 21:22:19 -07:00
Svetoslav Ganov
c397df7754 am 5dc30a77: Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
* commit '5dc30a770ab1b4f07ff10502f9de9ec39daac41d':
  DatePicker crashes when going from 2036 to 2035 via ▼
2011-10-19 21:17:14 -07:00
Svetoslav Ganov
5dc30a770a Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0 2011-10-19 21:15:30 -07:00