Commit Graph

19057 Commits

Author SHA1 Message Date
Mathias Agopian
c6f607dcdd am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp

* commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b':
  fix a bug where FLIP_H would do a 180 rotation
2010-10-11 14:40:02 -07:00
Mathias Agopian
20f29b4a2a Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread 2010-10-11 14:37:57 -07:00
Mathias Agopian
3c2c54c270 fix a bug where FLIP_H would do a 180 rotation
Change-Id: Ie2cc4a8543a5625750c8596f87edcb66fcbca31f
2010-10-11 14:19:24 -07:00
Mathias Agopian
2e109a8666 am d0528b74: Merge "deliver invalidate messages AFTER other messages" into gingerbread
Merge commit 'd0528b74b6de87c415ea498095e142d52c68875b' into gingerbread-plus-aosp

* commit 'd0528b74b6de87c415ea498095e142d52c68875b':
  deliver invalidate messages AFTER other messages
2010-10-11 14:17:25 -07:00
Mathias Agopian
eea35e1e86 Merge "deliver invalidate messages AFTER other messages" into gingerbread 2010-10-11 14:15:04 -07:00
Mathias Agopian
7b0ba16688 deliver invalidate messages AFTER other messages
because invalidate messages were always handled first, they
could prevent other messages to get through entirely.
there is no real reason to handle invalidate messages first because
the other messages are very uncommon and won't interfer with
updates.

Change-Id: Ib95cdf35a91407bd2f4d69dd082c5f546e1e0071
2010-10-11 14:11:15 -07:00
Joe Onorato
167af513b1 am 446547af: Merge "Don\'t throw when userActivity fails because of the permission check." into gingerbread
Merge commit '446547af37fd10142f15f6a9b3ac3007c6473981' into gingerbread-plus-aosp

* commit '446547af37fd10142f15f6a9b3ac3007c6473981':
  Don't throw when userActivity fails because of the permission check.
2010-10-11 13:55:15 -07:00
Joe Onorato
09ed308945 Merge "Don't throw when userActivity fails because of the permission check." into gingerbread 2010-10-11 13:52:34 -07:00
Brad Fitzpatrick
49dae8a7e7 am 6bb7a4a6: Go one day into 1970 for timezone code.
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp

* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
  Go one day into 1970 for timezone code.
2010-10-11 13:49:12 -07:00
Brad Fitzpatrick
f115ddb3ec am ce2f1909: Merge "On boot, advance time to at least 1970." into gingerbread
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp

* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
  On boot, advance time to at least 1970.
2010-10-11 13:03:15 -07:00
Brad Fitzpatrick
aefa57869c Merge "On boot, advance time to at least 1970." into gingerbread 2010-10-11 13:00:51 -07:00
Mathias Agopian
8d5ed61121 am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp

* commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
  fix a bug where timeouts would only be handled when a message was delivered
2010-10-11 12:44:23 -07:00
Mathias Agopian
7f5b5a8ebf Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread 2010-10-11 12:41:33 -07:00
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