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

62737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Hamby
28471700b9 am df1f572e: Merge "Add new RIL requests to support SIM data download via SMS over IMS." 
* commit 'df1f572e0be1d3fd6cc34e1998ca5f82e0760410':
  Add new RIL requests to support SIM data download via SMS over IMS.
 2011-10-20 16:57:31 -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
Mike Lockwood
d218f2350e Merge "SettingsProvider: Add support for overriding lockscreen.disabled default value" into ics-aah 2011-10-20 16:37:53 -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
473cc87e8e am 53b5d17d: am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 
* commit '53b5d17d08fa1d5fc63a9345691bf151a892fcaa':
  Bug 5275928 - Invasion of the monkeys
 2011-10-20 16:29:06 -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
Iliyan Malchev
9c782794ef am 64ef6b47: add -ldl to host executables 
* commit '64ef6b47e020da5370af8897638a0a778fa52b74':
  add -ldl to host executables
 2011-10-20 16:25:18 -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
72d22a9a9d am 63aa6622: Merge "Fix typos" 
* commit '63aa6622d0eb6592a582ac28078404bfc411bcef':
  Fix typos
 2011-10-20 15:44:58 -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
fc2fccc011 am c5d6fe01: Merge "Renaming of a hidden API: ShowSoftInputOnFocus" 
* commit 'c5d6fe015201b6522d0edf6b9c243ffa689744bf':
  Renaming of a hidden API: ShowSoftInputOnFocus
 2011-10-20 15:37:12 -07:00
Gilles Debunne
a086a49384 am 972b7d2c: Merge "Typo in ViewRootImpl" 
* commit '972b7d2c3bbb54a61a505d9d78927a158356ffb6':
  Typo in ViewRootImpl
 2011-10-20 15:37:10 -07:00
Gilles Debunne
27b359711d am f09c1502: Merge "Wrong word cut at end of lines with spaces" 
* commit 'f09c150232e79ffed43625f99ebc29003f6f11f4':
  Wrong word cut at end of lines with spaces
 2011-10-20 15:37:08 -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
2bb76ce95f am 995fe182: am 2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0 
* commit '995fe182f763f73951c23f8db59abed6c1e99c21':
  Fix handling in DisconnectingState
 2011-10-20 15:09:47 -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
f20a4c36a1 am fe14c2fc: am 957ad44e: Merge "Doc change: minor fixes to ICS highlights." into ics-mr0 
* commit 'fe14c2fccb40e7414c0c4be63bb2d3ab0637ec19':
  Doc change: minor fixes to ICS highlights.
 2011-10-20 14:36:50 -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
Svetoslav Ganov
b4fe6fcdf9 am c8c2e17e: Merge "Add content description setter to RemoteViews" 
* commit 'c8c2e17ecd3488b41d651369d942fafc745e6baa':
  Add content description setter to RemoteViews
 2011-10-20 14:32:38 -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
Mike Lockwood
912dfb887f SettingsProvider: Add support for overriding lockscreen.disabled default value 
Change-Id: Idf591337f4ee9745cb2931ec22895eec44b1da23
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-20 17:06:25 -04:00
Jason Sams
bae64ad69c am 79235d2a: Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff." 
* commit '79235d2a93086538817391c847a8063442e1e1f0':
  adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff.
 2011-10-20 13:56:55 -07:00
Jason Sams
7bffd447c8 am 5b6f2386: Merge "Remove ObjBaseRef from the hal struct" 
* commit '5b6f23868aff6a7317d2249224ea29d5e14113c9':
  Remove ObjBaseRef from the hal struct
 2011-10-20 13:54:50 -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
ab1156b476 am 981d1329: Merge "Fixes and optimizations of two quaternion functions." 
* commit '981d13291e31cfa4a5871aeb3279ed6be0a79776':
  Fixes and optimizations of two quaternion functions.
 2011-10-20 13:52:51 -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
Mike Lockwood
5ae0f9706f Merge "SystemUI: Fix problems with navigation bar on landscape devices" into ics-aah 2011-10-20 13:23:11 -07:00
Christopher Tate
561046badd am 257e67e4: Merge "Don\'t inappropriately kill ANRing drop recipients" 
* commit '257e67e44c96a00316091535c90e820db3de6050':
  Don't inappropriately kill ANRing drop recipients
 2011-10-20 13:22:25 -07:00
Christopher Tate
257e67e44c Merge "Don't inappropriately kill ANRing drop recipients" 2011-10-20 13:21:07 -07:00
Mike Lockwood
366da6739e SystemUI: Fix problems with navigation bar on landscape devices 
Change-Id: If35be8d53c7e4a7ae54b7df5dc96c987f482fd8b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-20 16:17:19 -04:00
Daniel Sandler
2c192eac12 am 8de952bf: am d2cd1f72: Merge "Lazily fetch the status bar service." into ics-mr0 
* commit '8de952bfc140d055cafad614b26f92c39cb1be5d':
  Lazily fetch the status bar service.
 2011-10-20 13:14:01 -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
da2da658c4 am 017009e0: am b321cd99: docs: fix tools release notes links 
* commit '017009e01ffe7a46822b7b2161fb62e423f009c9':
  docs: fix tools release notes links
 2011-10-20 13:08:16 -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
Mike Lockwood
33193aa6f0 Merge "Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay" into ics-aah 2011-10-20 12:24:10 -07:00
Eric Fischer
47fa992f1e am 68ddcc91: (-s ours) am 7ec4284a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '68ddcc91180cb00a9271837ee720a175ac9ccc75':
  Import revised translations.  DO NOT MERGE
 2011-10-20 11:31:41 -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