Commit Graph

19295 Commits

Author SHA1 Message Date
Mathias Agopian
23a0920339 fix a bug where timeouts would only be handled when a message was delivered
Change-Id: I98c69b129e75e065e61f47e54f0f855d9401b0dc
2010-10-11 12:40:09 -07:00
Andreas Huber
bb79813887 am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp

* commit '1010da2e02216b2f94fbe763a82d53201b340217':
  Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
2010-10-11 12:37:50 -07:00
Andreas Huber
5b25eff784 Merge "Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread 2010-10-11 12:36:03 -07:00
Mike Lockwood
fdc24c8dc3 am 86564dc6: Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread
Merge commit '86564dc673db6dd752c326e53404677a3db43bec' into gingerbread-plus-aosp

* commit '86564dc673db6dd752c326e53404677a3db43bec':
  GPS: Add update_network_state call to AGpsRillInterface
2010-10-11 12:05:20 -07:00
Brad Fitzpatrick
370ff0effb am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Merge commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp

* commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
  StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-11 12:05:14 -07:00
Mike Lockwood
c9df3e82d1 Merge "GPS: Add update_network_state call to AGpsRillInterface" into gingerbread 2010-10-11 11:56:47 -07:00
Brad Fitzpatrick
7669f03f89 Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread 2010-10-11 11:56:40 -07:00
Xia Wang
e99855c76a am c8511af0: Merge "Add mock ril control commands and tests" into gingerbread
Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp

* commit 'c8511af04a442551a204b1f47fabb317bcf54be0':
  Add mock ril control commands and tests
2010-10-11 10:32:04 -07:00
Xia Wang
e3e077d738 Merge "Add mock ril control commands and tests" into gingerbread 2010-10-11 10:28:20 -07:00
Jean-Baptiste Queru
0ace3f4b92 resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
2010-10-11 09:38:10 -07:00
Jean-Baptiste Queru
56150037c7 Merge "Dismissing AlertDialog before destroying WebView." 2010-10-11 09:15:50 -07:00
Hung-ying Tyan
1d83ed6b4e am 692cac9f: SipHelper: add debug log for challenge responses.
Merge commit '692cac9fdd7b179ba807351772fdf2339c000dfe' into gingerbread-plus-aosp

* commit '692cac9fdd7b179ba807351772fdf2339c000dfe':
  SipHelper: add debug log for challenge responses.
2010-10-10 23:38:04 -07:00
Jean-Baptiste Queru
63b6c291c7 am 65f23e71: Merge "Corrected visibility reporting error in WindowManager"
Merge commit '65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43' into gingerbread-plus-aosp

* commit '65f23e71bdf7d9ca8c4aa8ed126ac2bc9a2cbf43':
  Corrected visibility reporting error in WindowManager
2010-10-10 18:51:47 -07:00
Jean-Baptiste Queru
88ebed8b50 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-10 18:51:43 -07:00
Jean-Baptiste Queru
ed5753bb13 Merge "Corrected visibility reporting error in WindowManager" 2010-10-10 18:44:00 -07:00
Jean-Baptiste Queru
5945587a0d Merge "Hold partial wakelock during shutdown to avoid entering sleep" 2010-10-10 18:41:58 -07:00
Jean-Baptiste Queru
6c51446d17 am 0e430ccc: Merge "Telephony: Fix radio state printing"
Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp

* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
  Telephony: Fix radio state printing
2010-10-10 18:37:41 -07:00
Jean-Baptiste Queru
7599186c83 am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp

* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
  Fix time zone info in kernel is nothing after reboot
2010-10-10 18:37:37 -07:00
Jean-Baptiste Queru
a816bd18fc Merge "Telephony: Fix radio state printing" 2010-10-10 18:32:39 -07:00
Jean-Baptiste Queru
b142a1c706 am 334a4d84: Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Merge commit '334a4d84df457f0b2b6f89a6930c9ec05a637e5a' into gingerbread-plus-aosp

* commit '334a4d84df457f0b2b6f89a6930c9ec05a637e5a':
  Telephony: Remove unused mRuimFileHandler reference from CDMAPhone
2010-10-10 18:24:01 -07:00
Jean-Baptiste Queru
dba39be3cb Merge "Fix time zone info in kernel is nothing after reboot" 2010-10-10 18:20:55 -07:00
Jean-Baptiste Queru
e03613e669 Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone" 2010-10-10 18:15:17 -07:00
Gilles Debunne
d3c1f0cf29 am 6b8bdaa9: New AppsPermission and market style
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
2010-10-10 18:08:25 -07:00
Jean-Baptiste Queru
ef3270ad69 resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
2010-10-10 17:45:45 -07:00
Jean-Baptiste Queru
2d97f3e590 Merge "Support showing "Cold" battery health." 2010-10-10 17:22:11 -07:00
Jean-Baptiste Queru
20d7f36a40 am bd1454f5: Merge "Include debugger connection status in error entry"
Merge commit 'bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp

* commit 'bd1454f5005619b69d887fee6a7a4891b3323d18':
  Include debugger connection status in error entry
2010-10-10 17:00:59 -07:00
Jean-Baptiste Queru
0140c05b34 Merge "Include debugger connection status in error entry" 2010-10-10 16:49:54 -07:00
David Brown
418378482b am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
  Don't manually create CallerInfo objects from SipPhone
2010-10-10 16:44:01 -07:00
Mike Lockwood
5e7a919b3f am 2f77c3e4: Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread
Merge commit '2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp

* commit '2f77c3e4de3d68904a6a872d53283775b3a5c349':
  GPS: Fix another race condition in GPS HAL initialization
2010-10-10 16:41:28 -07:00
Justin Ho
074547f689 am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread
Merge commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df' into gingerbread-plus-aosp

* commit '5c61228bfc0fb26ae2e975cb5c6c74debf6233df':
  Updated media playback controls, unlock screen, misc framework assets
2010-10-10 16:38:14 -07:00
Mike Lockwood
29a4f07b7e Merge "GPS: Fix another race condition in GPS HAL initialization" into gingerbread 2010-10-10 16:32:49 -07:00
Justin Ho
9cfdf64d46 Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread 2010-10-10 16:30:01 -07:00
Vasu Nori
194b50f374 am b8f7a483: Merge "bug:3082865 don\'t use IN to construct sql to delete downloads" into gingerbread
Merge commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp

* commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5':
  bug:3082865 don't use IN to construct sql to delete downloads
2010-10-10 15:54:26 -07:00
Vasu Nori
ad96c8bba6 Merge "bug:3082865 don't use IN to construct sql to delete downloads" into gingerbread 2010-10-10 15:51:42 -07:00
Brad Fitzpatrick
e0ab7c5c70 am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp

* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
  Fallback to SharedPreferences$Editor.commit() when no apply() exists.
2010-10-10 15:30:55 -07:00
Xavier Ducrohet
594c08ff6d am 4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp

* commit '4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
  Avoid pre-processing images when they won't be used
2010-10-10 15:19:58 -07:00
Xavier Ducrohet
511f223765 Merge "Avoid pre-processing images when they won't be used" into gingerbread 2010-10-10 15:14:34 -07:00
Jeff Brown
a16d82c248 am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp

* commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32':
  Added more robust tracking and cancelation of events.
2010-10-10 14:50:38 -07:00
Jeff Brown
f817a6e0fd Merge "Added more robust tracking and cancelation of events." into gingerbread 2010-10-10 14:47:57 -07:00
Jeff Brown
90f0cee685 Added more robust tracking and cancelation of events.
This change fixes several issues where events would be dropped in the
input dispatch pipeline in such a way that the dispatcher could not
accurately track the state of the input device.

Given more robust tracking, we can now also provide robust cancelation
of input events in cases where an application might otherwise become
out of sync with the event stream due to ANR, app switch, policy decisions,
or forced focus transitions.

Pruned some of the input dispatcher log output.

Moved the responsibility for calling intercept*BeforeQueueing into
the input dispatcher instead of the input reader and added support for
early interception of injected events for events coming from trusted
sources.  This enables behaviors like injection of media keys while
the screen is off, haptic feedback of injected virtual keys, so injected
events become more "first class" in a way.

Change-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9
2010-10-10 14:45:51 -07:00
Gilles Debunne
badc41e13a am b72a335a: Merge "Voice input replaces selected text." into gingerbread
Merge commit 'b72a335a7f11176838d2d12e7295344c092c62ac' into gingerbread-plus-aosp

* commit 'b72a335a7f11176838d2d12e7295344c092c62ac':
  Voice input replaces selected text.
2010-10-10 14:04:25 -07:00
Gilles Debunne
c754c60a88 Merge "Voice input replaces selected text." into gingerbread 2010-10-10 14:01:10 -07:00
Mike Lockwood
047339e91c am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp

* commit '66e606040a521b81033ff75025620436c050c82e':
  GPS: More HAL initialization cleanup
2010-10-10 13:16:22 -07:00
Mike Lockwood
dc798229c6 Merge "GPS: More HAL initialization cleanup" into gingerbread 2010-10-10 13:13:16 -07:00
Wink Saville
471d762597 am 96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp

* commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696':
  Add some error-case logging.
2010-10-10 12:47:18 -07:00
Wink Saville
5f8993277a Merge "Add some error-case logging." into gingerbread 2010-10-10 12:27:34 -07:00
Irfan Sheriff
b2b3f12fd7 am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" into gingerbread
Merge commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6' into gingerbread-plus-aosp

* commit '7efff5c4c571d1a0111e31d73a87d27e1fae9de6':
  fix getmacaddress race condition (don't auto-merge)
2010-10-10 12:25:15 -07:00
Mindy Pereira
4df8ed2349 am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be' into gingerbread-plus-aosp

* commit '7a64e3a6f3e9f4de9cb097f604187d06268c23be':
  DO NOT MERGE Set the cap at alpha to 80% of the total available.
2010-10-10 12:22:46 -07:00
Irfan Sheriff
ba18dd9fa9 Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread 2010-10-10 12:21:51 -07:00
Brad Fitzpatrick
e9a1e57d04 am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp

* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
  Don't perform DNS lookup in android.net.Proxy.isLocalHost
2010-10-10 11:49:43 -07:00