Commit Graph

19057 Commits

Author SHA1 Message Date
Brad Fitzpatrick
3ebd2bd5de am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread
Merge commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a' into gingerbread-plus-aosp

* commit 'a2a1ca42bc07af77a8a10b714517d006cb66c36a':
  DropBoxManager.Entry implements Closeable
2010-10-08 13:01:29 -07:00
Brad Fitzpatrick
6dd8eec818 Merge "DropBoxManager.Entry implements Closeable" into gingerbread 2010-10-08 12:59:30 -07:00
Andreas Huber
10776901d8 am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread
Merge commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10' into gingerbread-plus-aosp

* commit '0fd4e216e7d6045528d5d1010f8b5f01581efb10':
  Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
2010-10-08 12:54:32 -07:00
Andreas Huber
1b66c4aca7 Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread 2010-10-08 12:51:31 -07:00
Jeff Brown
5911d0da61 am d00b4386: Merge "Clarify some comments on individual key codes." into gingerbread
Merge commit 'd00b4386aed2ef58077490ca7de7d93b98ed51fb' into gingerbread-plus-aosp

* commit 'd00b4386aed2ef58077490ca7de7d93b98ed51fb':
  Clarify some comments on individual key codes.
2010-10-08 12:48:27 -07:00
Jeff Brown
6ce23c4c8e Merge "Clarify some comments on individual key codes." into gingerbread 2010-10-08 12:44:43 -07:00
Mindy Pereira
1d06ec6fc5 am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit '612d570a6fc1e5a0e2e56250f597d1e96d698273' into gingerbread-plus-aosp

* commit '612d570a6fc1e5a0e2e56250f597d1e96d698273':
  DO NOT MERGE Adjust amount pull effects the glow and edge decay.
2010-10-08 12:10:09 -07:00
Mike Lockwood
f61b85883d am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21' into gingerbread-plus-aosp

* commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-08 11:20:33 -07:00
Andreas Huber
22a7979f09 am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
2010-10-08 11:18:03 -07:00
Mike Lockwood
7bfdae64bd Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 2010-10-08 11:17:17 -07:00
Andreas Huber
5d372aabe4 Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread 2010-10-08 11:16:07 -07:00
Andreas Huber
90bbd64e71 am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp

* commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c':
  Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
2010-10-08 11:05:10 -07:00
Andreas Huber
ef072a1f4b Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread 2010-10-08 10:59:52 -07:00
James Dong
5a7c0ea14f am 6dcdfdb4: Merge "Name the writer threads" into gingerbread
Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp

* commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f':
  Name the writer threads
2010-10-08 10:35:57 -07:00
Andreas Huber
f3aa191123 am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp

* commit 'c5912acc04226a8f9377d1aad50de8d3f883854c':
  Disable the access unit timeout temporarily while a seek operation is in progress.
2010-10-08 10:35:53 -07:00
Gilles Debunne
87003cec26 am 56e9b8eb: Merge "Long press with trackball selects word under cursor." into gingerbread
Merge commit '56e9b8ebb20a992a80696f933a2225544670ef8b' into gingerbread-plus-aosp

* commit '56e9b8ebb20a992a80696f933a2225544670ef8b':
  Long press with trackball selects word under cursor.
2010-10-08 10:19:22 -07:00
James Dong
b2df56fcf6 Merge "Name the writer threads" into gingerbread 2010-10-08 10:06:22 -07:00
Andreas Huber
3389b28cd0 Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread 2010-10-08 10:01:37 -07:00
Gilles Debunne
285bb1b8ab Merge "Long press with trackball selects word under cursor." into gingerbread 2010-10-08 09:22:29 -07:00
Eric Laurent
04315be21c am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
  Added getter for session Id to AudioSink
2010-10-08 08:30:03 -07:00
Eric Laurent
740f0561f2 Merge "Added getter for session Id to AudioSink" into gingerbread 2010-10-08 08:28:08 -07:00
Andreas Huber
71a597b5ee am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp

* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
2010-10-08 08:17:54 -07:00
Andreas Huber
fc85f3a7f4 Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread 2010-10-08 08:02:42 -07:00
Chung-yih Wang
1f821cd3ad am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '44b7ef5408f135892fe8e8643fa4946532902672' into gingerbread-plus-aosp

* commit '44b7ef5408f135892fe8e8643fa4946532902672':
  SipService: add permission check for using API
2010-10-07 21:37:09 -07:00
Chung-yih Wang
7d7daee5fa Merge "SipService: add permission check for using API" into gingerbread 2010-10-07 21:28:23 -07:00
Dianne Hackborn
b44a3c9714 am 78d68836: Implement tracking of package install times.
Merge commit '78d688369a2240009d3bbe4126996a973b2e2fe2' into gingerbread-plus-aosp

* commit '78d688369a2240009d3bbe4126996a973b2e2fe2':
  Implement tracking of package install times.
2010-10-07 20:13:24 -07:00
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