Commit Graph

25802 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
f8b1da6be5 am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
  according to rfc2617, nc-value = 8LHEX
2010-12-28 15:47:42 -08:00
Jean-Baptiste Queru
19104d5357 Merge "according to rfc2617, nc-value = 8LHEX" 2010-12-28 15:33:10 -08:00
Alon Albert
f15634ccf9 am 2967aa3e: (-s ours) am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '2967aa3e6060f582f166cdb334a0fb9ff0cb4759':
  Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
2010-12-28 15:09:09 -08:00
Svetoslav Ganov
9510bd46e1 Merge "3313982 DatePicker/TimePicker allow users to scroll date/time even when disabled." 2010-12-28 15:06:34 -08:00
Alon Albert
8edbe22afe am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '672ebb61a755e4bbe60e4e884b1adadf186733b6':
  Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
2010-12-28 14:57:09 -08:00
Alon Albert
d3b9dc712b Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread 2010-12-28 14:44:51 -08:00
Svetoslav Ganov
062bbd6c96 Merge "Adding APIs for setting whether to show week number and setting the start day of week. Cleaned up the code a bit." 2010-12-28 12:44:54 -08:00
Jean-Baptiste Queru
1ee57e397f am 6637e307: am bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"
* commit '6637e307494475b85afe8869d312d4a2f832d8f4':
  Fix for writing empty strings to Parcel::writeString8()
2010-12-28 11:54:08 -08:00
Jean-Baptiste Queru
587567a9b5 am bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"
* commit 'bfb5f5966b36c4960b56f6de10ba261332208db9':
  Fix for writing empty strings to Parcel::writeString8()
2010-12-28 11:39:21 -08:00
Jean-Baptiste Queru
fb1a3da503 Merge "Fix for writing empty strings to Parcel::writeString8()" 2010-12-28 11:25:50 -08:00
Jean-Baptiste Queru
d93f368615 am e90a1b16: am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit 'e90a1b16a3d6c559cb7fc47ad967a1810d88e923':
  The phone is crashing when unknown mime content is transferred.
2010-12-28 11:00:39 -08:00
Dianne Hackborn
8387fcf6b6 am 536feda7: am 949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"
* commit '536feda7b133b297d43ea62111979d150f222d88':
  frameworks/base: Fix to release references to previous live wallpaper
2010-12-28 10:57:51 -08:00
Dianne Hackborn
97de45bcf4 am 878fb913: am 6c5d151b: Merge "frameworks/base: Fix to release references in ActivityManagerService"
* commit '878fb9138b4de5767131be6a2e270cbd834daad3':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-28 10:57:43 -08:00
Jean-Baptiste Queru
bbdb0c95bc am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit '752942ec4719e6a274d6ab11103ac28459cb0f0c':
  The phone is crashing when unknown mime content is transferred.
2010-12-28 10:55:04 -08:00
Dianne Hackborn
2a5a251726 am 949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"
* commit '949fc0efc3203c580372e7713df5331818ae81f1':
  frameworks/base: Fix to release references to previous live wallpaper
2010-12-28 10:38:38 -08:00
Dianne Hackborn
8097e174fe am 6c5d151b: Merge "frameworks/base: Fix to release references in ActivityManagerService"
* commit '6c5d151b29d7ae311267fa44048fbadb759b7a5a':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-28 10:38:32 -08:00
Jean-Baptiste Queru
44086a0039 Merge "The phone is crashing when unknown mime content is transferred." 2010-12-28 10:34:02 -08:00
Daisuke Miyakawa
acc9dd2f14 Merge "Let callers replace layout for LocalePicker adapter." 2010-12-28 10:07:30 -08:00
Cary Clark
4d044465c5 Merge "map keyboard for webview" 2010-12-28 08:54:30 -08:00
Ken Wakasa
33ffea438a Merge "Add TYPE_NUMBER_VARIATION_PASSWORD for entering a numeric password." 2010-12-26 01:08:01 -08:00
Irfan Sheriff
870f368528 Merge "Enable networks on screen on" 2010-12-24 12:34:52 -08:00
Kristian Monsen
80f228da60 Merge "Only register one ProxyReceiver" 2010-12-24 04:17:05 -08:00
Jamie Gennis
64b365993b Merge "egl: fixes for object refcounts" 2010-12-23 16:58:22 -08:00
Vasu Nori
6a4e5114ea Merge "fix all flaky tests to make them work consistently." 2010-12-23 16:48:18 -08:00
Guang Zhu
f61dd1df33 Merge "bugfix: remove dump timeout message after dump is received" 2010-12-23 16:28:13 -08:00
Michael I. Gold
0c3ce2a365 egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I213b8be77b1a23b5a8a6afaac60643662c8aa010
2010-12-23 16:12:19 -08:00
Eric Fischer
30fb279543 Merge "Import revised translations." 2010-12-23 14:46:23 -08:00
Guang Zhu
5af7dad41d Merge "Throw exception if webview dump times out" 2010-12-23 14:44:15 -08:00
Dianne Hackborn
dbf4fe4929 am cc43401c: am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit 'cc43401cd10c681238e0be01de8fe14f5da94fb1':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:29:36 -08:00
Jeff Brown
530caefeac am fa93584a: (-s ours) am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit 'fa93584a4fab6ca8d9348658dc30cedf76891753':
  Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 14:27:29 -08:00
Dianne Hackborn
6a7a699f3c am 6eef0ca5: Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread
* commit '6eef0ca59438a15d14be8a72b6b29f01da91a5b8':
  frameworks/base: Fix to release references in ActivityManagerService
2010-12-23 14:22:32 -08:00
Dianne Hackborn
0e6375a789 Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread 2010-12-23 14:19:03 -08:00
Dianne Hackborn
d3994f5183 Merge "frameworks/base: Fix to release references to previous live wallpaper" 2010-12-23 14:17:54 -08:00
Dianne Hackborn
37d273cbf0 Merge "frameworks/base: Fix to release references in ActivityManagerService" 2010-12-23 14:14:38 -08:00
Andreas Huber
bc5a30b42b Merge "Squashed commit of the following:" 2010-12-23 13:11:29 -08:00
Jaikumar Ganesh
8372c603d8 Merge "Expose insecure rfcomm Bluetooth API." 2010-12-23 13:06:50 -08:00
Jeff Brown
f71751848b am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread
* commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
  Fix policy issues when screen is off. (DO NOT MERGE)
2010-12-23 12:43:48 -08:00
Jeff Brown
37cc46a0b4 Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread 2010-12-23 12:41:59 -08:00
Shimeng (Simon) Wang
3bd5db7c26 Merge "Merge WebKit at r73109: update web_user_agent string." 2010-12-23 11:41:54 -08:00
Gilles Debunne
daf99bc878 Merge "Fix for ellipsized text that has two lines at maximum." 2010-12-23 11:20:48 -08:00
Irfan Sheriff
391179e8dc Merge "Fix wifi broadcasts" 2010-12-23 09:17:39 -08:00
Kristian Monsen
7e97c08aff Merge "Only store Application context" 2010-12-23 07:35:40 -08:00
Shih-wei Liao
f51893c24e Merge "Clean-up." 2010-12-23 07:08:54 -08:00
Xavier Ducrohet
8f00ee5513 Merge "LayoutLib: improve bitmap support." 2010-12-23 00:13:24 -08:00
Xavier Ducrohet
bc655f005e Merge "LayoutLib: support for layers." 2010-12-23 00:09:07 -08:00
Dianne Hackborn
54e2f4b05c am 60238734: am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '6023873463331d30b7ed12942c3323f1b6975ed8':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:40:56 -08:00
Dianne Hackborn
6314ef2b8a am 2dda21b9: Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread
* commit '2dda21b93f8a8e0fb70de44eae826bc68349813c':
  Another stab at fixing issue #3149290 java.lang.RuntimeException:...
2010-12-22 18:37:08 -08:00
Dianne Hackborn
947d92c963 Merge "Another stab at fixing issue #3149290 java.lang.RuntimeException:..." into gingerbread 2010-12-22 18:34:40 -08:00
Jeff Brown
2ff72374bf Merge "Enable touch splitting by default for Honeycomb apps." 2010-12-22 18:29:19 -08:00
Dianne Hackborn
94b6282c2d Merge "Fix issue #3299143: Problem report for Hanping Chinese Dictionary Pro" 2010-12-22 17:44:14 -08:00