Commit Graph

18981 Commits

Author SHA1 Message Date
Marco Nelissen
2ae3dd2ce1 am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513' into gingerbread-plus-aosp

* commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513':
  Do not merge.
2010-10-07 17:52:15 -07:00
Marco Nelissen
8950fabfbc am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread

* commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f':
  Do not merge.
2010-10-07 17:48:46 -07:00
Kenny Root
df8ae2a633 am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '54e01e0f980cfb78153d5481f7e67cef90416174' into gingerbread-plus-aosp

* commit '54e01e0f980cfb78153d5481f7e67cef90416174':
  Symlink application lib directory when on SD card
2010-10-07 17:41:05 -07:00
Hung-ying Tyan
a334c64cc4 am 08faac3c: Unhide SIP API.
Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp

* commit '08faac3c26e12863858e1534985dd950193f755f':
  Unhide SIP API.
2010-10-07 17:40:51 -07:00
Kenny Root
ddfbafa786 Merge "Symlink application lib directory when on SD card" into gingerbread 2010-10-07 17:38:44 -07:00
Hung-ying Tyan
115e35fc3b am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread
Merge commit '26cb01e880af5f23a58e4336facd30fa7d52581e' into gingerbread-plus-aosp

* commit '26cb01e880af5f23a58e4336facd30fa7d52581e':
  Use explicit intent for installing credentials.
2010-10-07 17:29:49 -07:00
Hung-ying Tyan
ed1076e47e Merge "Use explicit intent for installing credentials." into gingerbread 2010-10-07 17:27:28 -07:00
Gilles Debunne
f5c77459fa am 3ecceb5b: Merge "TextView refactoring to ease future merges in HC." into gingerbread
Merge commit '3ecceb5b94233320ed88825759d6118fed7add2c' into gingerbread-plus-aosp

* commit '3ecceb5b94233320ed88825759d6118fed7add2c':
  TextView refactoring to ease future merges in HC.
2010-10-07 17:21:40 -07:00
Gilles Debunne
313b09d0af Merge "TextView refactoring to ease future merges in HC." into gingerbread 2010-10-07 17:18:59 -07:00
Jaikumar Ganesh
98a880a34c am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread
Merge commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914' into gingerbread-plus-aosp

* commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
2010-10-07 16:58:13 -07:00
Jaikumar Ganesh
36150e99a4 Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread 2010-10-07 16:56:06 -07:00
Mindy Pereira
5f8dbb502f am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit 'dfe0870e72574eaffc9a165f01a021149529d9c2' into gingerbread-plus-aosp

* commit 'dfe0870e72574eaffc9a165f01a021149529d9c2':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
2010-10-07 16:04:35 -07:00
Chung-yih Wang
86638e0acb am 4483232f: Suppress harder for echo without affecting the volume of real voice.
Merge commit '4483232f57ebdc444bf045120c302235a211e737' into gingerbread-plus-aosp

* commit '4483232f57ebdc444bf045120c302235a211e737':
  Suppress harder for echo without affecting the volume of real voice.
2010-10-07 16:02:06 -07:00
Mindy Pereira
4073b9e1cf Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread 2010-10-07 15:54:51 -07:00
Jeff Brown
03838e38f6 am a1bf0a06: Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread
Merge commit 'a1bf0a06b26ecc039adfdb98eab6fb984d5d5571' into gingerbread-plus-aosp

* commit 'a1bf0a06b26ecc039adfdb98eab6fb984d5d5571':
  Minor fix for InputReader support for non-touchscreen devices.
2010-10-07 15:48:06 -07:00
Mindy Pereira
185f43f222 am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread
Merge commit '36a182870527f1d71f482e9a280bc818a4609cb6' into gingerbread-plus-aosp

* commit '36a182870527f1d71f482e9a280bc818a4609cb6':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.
2010-10-07 15:47:44 -07:00
Xia Wang
8118ee938f am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread
Merge commit 'e1c8e38834dffbeaeacbbe0490a5eae45b54db8b' into gingerbread-plus-aosp

* commit 'e1c8e38834dffbeaeacbbe0490a5eae45b54db8b':
  Port mock ril controller and tests to GB. DO NOT MERGE
2010-10-07 15:47:27 -07:00
Gilles Debunne
8c59c6b87e am 4a962a06: Merge "Removing \'last\' of red cross asset." into gingerbread
Merge commit '4a962a06db88d7132448808aaae82b94728b69a6' into gingerbread-plus-aosp

* commit '4a962a06db88d7132448808aaae82b94728b69a6':
  Removing 'last' of red cross asset.
2010-10-07 15:47:23 -07:00
Jeff Brown
f4f8284fa9 am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread
Merge commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db' into gingerbread-plus-aosp

* commit 'd577cfd73a223279f9a5af698f55edd38a3fe4db':
  Switch Looper back to using poll() instead of epoll().
2010-10-07 15:46:57 -07:00
Gloria Wang
a34207b4f2 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp
Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
2010-10-07 15:27:17 -07:00
Gloria Wang
74d354972d Merge "Update of DRM framework." 2010-10-07 14:40:17 -07:00
Jeff Brown
86638ad353 Merge "Minor fix for InputReader support for non-touchscreen devices." into gingerbread 2010-10-07 14:35:38 -07:00
Mindy Pereira
92e711132b Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread 2010-10-07 14:23:29 -07:00
Xia Wang
782cf703b8 Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbread 2010-10-07 14:04:12 -07:00
Andreas Huber
c501b30490 am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp

* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
2010-10-07 14:02:26 -07:00
Justin Ho
313fb1f3bb am b74941e3: Merge "Fixed popup assets (background)" into gingerbread
Merge commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4' into gingerbread-plus-aosp

* commit 'b74941e32e068ec03f90b9a53670328cd17ff4b4':
  Fixed popup assets (background)
2010-10-07 14:02:22 -07:00
Adam Powell
3b800886fa am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread
Merge commit 'f15dfbec5df911f4cedd3e302864496d77ce295b' into gingerbread-plus-aosp

* commit 'f15dfbec5df911f4cedd3e302864496d77ce295b':
  Fix bug 3071869 - text anchors are now treated as application sub-panels.
2010-10-07 14:02:15 -07:00
Brad Fitzpatrick
bb23e1dbee am 6275dbbe: Merge "Quiet unnecessary debug logging." into gingerbread
Merge commit '6275dbbea8ad7bde984a362516654004e111dc67' into gingerbread-plus-aosp

* commit '6275dbbea8ad7bde984a362516654004e111dc67':
  Quiet unnecessary debug logging.
2010-10-07 14:02:10 -07:00
Andreas Huber
9da1364f32 am 02654f01: Merge "On this particular device the hardware video decoder spits out buffers that don\'t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread
Merge commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2' into gingerbread-plus-aosp

* commit '02654f01bc6bd2e581b4a1d2409ecea217294fa2':
  On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.
2010-10-07 14:02:01 -07:00
Kenny Root
d5f3d15f2d am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp

* commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
  Eliminate MCS_GIVE_UP state
2010-10-07 14:01:55 -07:00
Gilles Debunne
9b6f405eae am e86a6b2a: Merge "Removed unused and broken screen_progress" into gingerbread
Merge commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4' into gingerbread-plus-aosp

* commit 'e86a6b2a4dc0c01717366c35fd0d6acd778988d4':
  Removed unused and broken screen_progress
2010-10-07 14:01:48 -07:00
Brad Fitzpatrick
268ca487ac am 30f5c8fe: More DropBoxManager javadoc love.
Merge commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc' into gingerbread-plus-aosp

* commit '30f5c8fede241e7560f4a33e48af3a4627fd5efc':
  More DropBoxManager javadoc love.
2010-10-07 14:01:40 -07:00
Brad Fitzpatrick
1c40b657a4 am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread
Merge commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2' into gingerbread-plus-aosp

* commit 'fd124570ce647b3adc5dc30ce782d6e017dab4a2':
  DropBox.Entry javadoc syntax fix
2010-10-07 14:01:30 -07:00
Kenny Root
f08308802b am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"
Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp

* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
  Revert "Only allow 8 OBBs to be mounted by a UID"
2010-10-07 14:01:23 -07:00
John Wang
b141dacaa9 am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread
Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
  Add flag to skip restoring network seletion.
2010-10-07 14:00:53 -07:00
Gilles Debunne
612a80bfbe Merge "Removing 'last' of red cross asset." into gingerbread 2010-10-07 13:53:16 -07:00
Jeff Brown
77e26fce8e Minor fix for InputReader support for non-touchscreen devices.
Change-Id: I2256e37dd1c6f3836f82786aae14ee5d0c98f4c6
2010-10-07 13:44:51 -07:00
Jeff Brown
95cefd9bdc Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread 2010-10-07 13:29:56 -07:00
Jeff Brown
54e1cdacd2 Switch Looper back to using poll() instead of epoll().
Added a couple of micro-optimizations to avoid calling wake() unnecessarily
and reduce JNI overhead slightly.

Fixed a minor issue where we were not clearing the "next" field of Messages
returned by the MessageQueue so the Message would hold on to its successor
and potentially prevent the GC from collecting it if the message were leaked
somehow.

Change-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c
2010-10-07 13:26:39 -07:00
Andreas Huber
d62a1d5c82 Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread 2010-10-07 11:59:53 -07:00
Justin Ho
ae527c34f4 Merge "Fixed popup assets (background)" into gingerbread 2010-10-07 11:56:18 -07:00
Adam Powell
a0de478b0e Merge "Fix bug 3071869 - text anchors are now treated as application sub-panels." into gingerbread 2010-10-07 11:32:49 -07:00
Brad Fitzpatrick
42ea1611dd Merge "Quiet unnecessary debug logging." into gingerbread 2010-10-07 11:27:56 -07:00
Andreas Huber
14fc691358 Merge "On this particular device the hardware video decoder spits out buffers that don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume." into gingerbread 2010-10-07 10:57:32 -07:00
Kenny Root
707191f60a Merge "Eliminate MCS_GIVE_UP state" into gingerbread 2010-10-07 10:54:14 -07:00
Gilles Debunne
01bb31e340 Merge "Removed unused and broken screen_progress" into gingerbread 2010-10-07 10:52:11 -07:00
Brad Fitzpatrick
eeaba93ead Merge "DropBox.Entry javadoc syntax fix" into gingerbread 2010-10-07 10:20:32 -07:00
John Wang
544dd8158b Merge "Add flag to skip restoring network seletion." into gingerbread 2010-10-07 09:47:01 -07:00
Eric Rowe
b6aae63bcf am f8d2acdc: Merge "DO NOT MERGE Initialize bluetooth profiles in BT stress tests" into gingerbread
Merge commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6' into gingerbread-plus-aosp

* commit 'f8d2acdc57fd747278bb909c9e15b959e07d63b6':
  DO NOT MERGE Initialize bluetooth profiles in BT stress tests
2010-10-07 09:19:37 -07:00
Wink Saville
f9e4c81d9b am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread
Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp

* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
  Changed handling of onQueryCompelete to not use mimeType.
2010-10-07 09:16:54 -07:00