drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,376 Commits 1 Branch 0 Tags
Commit Graph

60376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
44cd3f8f3d Merge "Fix compilation issue when DEBUG_GLYPHS define is activated" 2011-10-20 18:58:03 -07:00
Mathias Agopian
10b4503f2b am 16bece04: Merge "added dpi and refresh rate info in SF\'s dumpsys" into ics-mr0 
* commit '16bece04bdbac9af5228436f70267ec5763315de':
  added dpi and refresh rate info in SF's dumpsys
 2011-10-20 17:48:02 -07:00
Mathias Agopian
16bece04bd Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0 2011-10-20 17:45:55 -07:00
Jim Miller
dd579c3e92 am 6b024448: Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 
* commit '6b0244485c1d20261cffb0fbabebdfefd701867e':
  Fix 5493266: Properly restore background after playing music
 2011-10-20 17:35:51 -07:00
Jim Miller
6b0244485c Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 2011-10-20 17:33:42 -07:00
Mathias Agopian
abf88bead4 added dpi and refresh rate info in SF's dumpsys 
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
 2011-10-20 17:22:38 -07:00
Jim Miller
2928c9d82b Fix 5493266: Properly restore background after playing music 
KeyguardViewBase maintains the transparent background for all lock screen
views.  The background was being overwritten by the change to make lock
screen opaque when music was being shown.

Change-Id: Id1ab415f68746b20c9229fa58fef9ec8be354f01
 2011-10-20 17:00:38 -07:00
Jake Hamby
df1f572e0b Merge "Add new RIL requests to support SIM data download via SMS over IMS." 2011-10-20 16:55:48 -07:00
Jake Hamby
094854091b Add new RIL requests to support SIM data download via SMS over IMS. 
On an LTE device where incoming SMS messages over IMS are sent to
the framework via RIL_UNSOL_RESPONSE_NEW_SMS responses sent to
the RIL, it may be necessary to process USIM data download SM's
(message class 2). This requires the RIL to implement two new requests.

1) RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS:
   send an ENVELOPE command to the UICC, receiving the SW1 and SW2
   status bytes in addition to the command response.

2) RIL_REQUEST_SMS_ACKNOWLEDGE_WITH_PDU:
   send an RP-ACK or RP-ERROR acknowledgement to the incoming SM,
   including an acknowledgement PDU containing the envelope response.

Change-Id: If597a14fa8c4780c75da84fa96c49abcb05960f2
 2011-10-20 16:31:28 -07:00
Adam Powell
53b5d17d08 am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 
* commit 'a5c371bf1fc878f84c296a63839a5d031dea843f':
  Bug 5275928 - Invasion of the monkeys
 2011-10-20 16:26:56 -07:00
Adam Powell
a5c371bf1f Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 2011-10-20 16:25:04 -07:00
Iliyan Malchev
64ef6b47e0 add -ldl to host executables 
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-10-20 16:21:25 -07:00
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
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