Mathias Agopian
37d95f6f91
handle EINTR when calling sensor HAL's poll function
...
some sensor HALs don't handle EINTR, make sure to catch it in the
sensorservice.
also if we ever encounter an error that we can't handle, we abort
which will restart us (or the whole system process if we're running
in it)
Bug: 5511741
Change-Id: I7051882b06980f778736b53d6cd021a99b5ca8d2
2011-11-09 17:53:14 -08:00
Wink Saville
f08455451c
[maguro] Update COMPREHENSION-TLV parser in CAT
...
1. Fix the ClassCastException while handling spec out 'Setup menu'
-Ghana MTN simcard and JDI simcard sends abnormal 'setup menu'cmd.
-Those 'setup menu' is spec out.
-At the end of the proactive cmd,extra bytes '0x00 0x00 0x00 0x00' is
followed.
- That cause ClassCastException and phone crash.
Bug: 5574160
Change-Id: Ieafb6c4efd94bb4e2a39a04612a6761c958654bb
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
2011-11-09 17:31:34 -08:00
John Reck
5f1c549132
Pause drawing when not visible
...
Bug: 5594608
If onPause is called or if the view or view's window is no longer
visible, pause webview drawing. Calls to onDraw will continue to work,
but animations and other continual drawing will stop
Change-Id: I11640f087852d1a9a33b945ff72297fab1d25b94
2011-11-09 17:19:43 -08:00
Mathias Agopian
ba232d0494
am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
...
* commit '42694dc4a7af4f38e39cb26a852f3f75e730bb05':
Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 00:43:55 +00:00
Mathias Agopian
42694dc4a7
am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
...
* commit '3e458306b0caf4e21294acc58286b24bda08a242':
Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 00:41:43 +00:00
Mathias Agopian
3e458306b0
Set the WM refresh rate to 60 Hz for tuna devices only DO
...
NOT MERGE
This approach is TEMPORARY until we can do this properly.
Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
2011-11-09 16:01:07 -08:00
George Mount
331493085d
DO NOT MERGE Set the initial scroll position for RTL.
...
Bug 5268793
Webkit knows about the correct initial position for web pages.
On initial show, scroll to the webkit position.
Cherry-picked from master CL: I2537b84a
External WebKit CL: I6a91b97f
Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
2011-11-09 15:37:26 -08:00
Jim Miller
d9147aad5e
am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
...
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-09 23:24:07 +00:00
Eric Fischer
c712a671d8
am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '6b992090f6eb1e14553be22373799258bb401e3d':
Import revised translations. DO NOT MERGE
2011-11-09 23:24:06 +00:00
Jim Miller
270826a887
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
2011-11-09 15:19:31 -08:00
Eric Fischer
6b992090f6
am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '3124bf64404dbb90cc521abf4c7bf8d438346362':
Import revised translations. DO NOT MERGE
2011-11-09 23:18:10 +00:00
Eric Fischer
3124bf6440
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-09 15:15:42 -08:00
satok
05f2470061
Respect user settings for spell checking language if explicitly set
...
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
2011-11-10 07:54:52 +09:00
Robert Ly
c49f5b734e
am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
...
* commit '69db56958fdac41a093cd6cf00cbe200f2885730':
docs: update samples toc for rs sample
2011-11-09 21:28:34 +00:00
Robert Ly
69db56958f
am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
...
* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
docs: update samples toc for rs sample
2011-11-09 21:25:45 +00:00
Robert Ly
bd4bdbec62
Merge "docs: update samples toc for rs sample" into ics-mr0
2011-11-09 13:23:34 -08:00
Jamie Gennis
c1c327ed63
am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1
...
* commit '97ece7a95f76ec724633d4f4764291ea4dc20933':
EGL: add deferred saving of the cache
2011-11-09 19:48:30 +00:00
Jamie Gennis
97ece7a95f
Merge "EGL: add deferred saving of the cache" into ics-mr1
2011-11-09 11:46:45 -08:00
Jeff Brown
6e1c362a21
am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
...
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
2011-11-09 19:22:14 +00:00
Jeff Brown
e7de36e605
Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
2011-11-09 11:20:24 -08:00
Peter Ng
02e075ae03
am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1
...
* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
Making quicksettings opaque again
2011-11-09 19:05:27 +00:00
John Reck
22a073f073
am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1
...
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
Fix determining find on page overlap
2011-11-09 19:00:49 +00:00
The Android Open Source Project
97b53f1d22
am eae6c997: Reconcile with ics-mr0-release
...
* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':
2011-11-09 19:00:45 +00:00
Jean-Michel Trivi
2b9d17aebd
am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
...
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
Bug 5585323 New system permission for media decode
2011-11-09 19:00:39 +00:00
David Brown
ca068a517b
am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
...
* commit 'b6b44cef94a38b6f403b43f55d77d3602de18a3c':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
2011-11-09 19:00:11 +00:00
Glenn Kasten
a6e1ceefc6
am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
...
* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
Bug 5478024 drop after decode if can't drop before
2011-11-09 19:00:05 +00:00
Jake Hamby
0457e7ed94
am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
...
* commit '9c5c97f61818f4d20079616a98d62f888f07d285':
Fix exception when sending multi-page SMS with Turkish characters.
2011-11-09 19:00:02 +00:00
Eric Laurent
4378e56b35
am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
...
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback
2011-11-09 18:59:51 +00:00
Brian Colonna
830228ef8d
am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
...
* commit '09a56563cea260f12b5606837f5b01420b920170':
Fix 5514230: preventing null window token from occurring
2011-11-09 18:59:50 +00:00
Gilles Debunne
4eddb9356a
am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1
...
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
Bug 5575396: close spell session on language change
2011-11-09 18:59:45 +00:00
Jeff Sharkey
ba83524338
am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1
...
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
Bootstrap stats before registering listeners.
2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51
am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
...
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
Make operation counts monotonically increase.
2011-11-09 18:59:38 +00:00
Jeff Sharkey
5d528576ef
am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1
...
* commit '2048789c64d30b0d3c42c4df7e705f14b7295e10':
Dispatch alerts through background thread.
2011-11-09 18:59:37 +00:00
Jeff Sharkey
dcb3b6ad57
am f3882914: Merge "Make policy data enabled flag static." into ics-mr1
...
* commit 'f3882914e668501ee1dabd42207ed18348050c14':
Make policy data enabled flag static.
2011-11-09 18:59:35 +00:00
Daniel Sandler
cc106d9d87
am da738d63: Merge "Add day of week." into ics-mr1
...
* commit 'da738d638cc2fee29d5936f21c6eadbcf173a718':
Add day of week.
2011-11-09 18:59:34 +00:00
Mathias Agopian
21e3a16e34
am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
...
* commit 'e4a1bafba351a1b4cea18af3442412de03dd4d89':
decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
2011-11-09 18:59:27 +00:00
Dianne Hackborn
0126a4a7f2
am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1
...
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
Don't crash if there is no connectivity service.
2011-11-09 18:59:19 +00:00
Svetoslav Ganov
f32985381c
am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
...
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
NumberPicker incorectly enforcing minimal width and height.
2011-11-09 18:59:14 +00:00
Jeff Sharkey
ebf32009ce
am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1
...
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
Avoid inconsistent state when remove fails.
2011-11-09 18:59:11 +00:00
Jeff Brown
6f551dd14a
am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
...
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
2011-11-09 18:59:01 +00:00
Mathias Agopian
bd35fc2590
am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1
...
* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
SensorService now always clamps the requested rate
2011-11-09 18:58:58 +00:00
Peter Ng
34dd937be1
Merge "Making quicksettings opaque again" into ics-mr1
2011-11-09 10:57:23 -08:00
Jason Simmons
efae3d24bd
Merge "resolved conflicts for merge of 3af8b88d to ics-aah" into ics-aah
2011-11-09 10:57:19 -08:00
Mike Lockwood
43adbae803
Merge "NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi" into ics-aah
2011-11-09 10:55:26 -08:00
Mike Lockwood
0342a420a4
NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
...
Change-Id: I936fd9a8119ee361ec0afde60f7931c58ffdd524
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-09 10:49:29 -08:00
Andreas Huber
3f99d95312
There's no point in trying to continue to decode after an error was signalled.
...
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug: 5588658
2011-11-09 10:26:06 -08:00
Jason Simmons
f981686779
resolved conflicts for merge of 3af8b88d to ics-aah
...
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
2011-11-09 10:08:21 -08:00
Andreas Huber
977702929b
Don't believe the PV decoder's lies...
...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
2011-11-09 10:03:07 -08:00
John Reck
36a7f2a9ad
Merge "Fix determining find on page overlap" into ics-mr1
2011-11-09 09:28:11 -08:00
The Android Open Source Project
eae6c9972d
Reconcile with ics-mr0-release
...
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
2011-11-09 09:00:40 -08:00