Commit Graph

18750 Commits

Author SHA1 Message Date
Chia-chi Yeh
6f6d1a3989 am 4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread
Merge commit '4fc04f160f5ad99ce618084c689b239a2644deca' into gingerbread-plus-aosp

* commit '4fc04f160f5ad99ce618084c689b239a2644deca':
  RTP: Add a baseline echo suppressor.
2010-10-04 11:53:56 -07:00
Chia-chi Yeh
fc4a64540c Merge "RTP: Add a baseline echo suppressor." into gingerbread 2010-10-04 11:51:45 -07:00
Andreas Huber
2f110ae1ae am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp

* commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
2010-10-04 11:47:52 -07:00
Andreas Huber
4ffa384fbe Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread 2010-10-04 11:45:56 -07:00
Andreas Huber
76b106b10a am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread
Merge commit '7fa693740756123fa9d05e62fb47aae5d703c71d' into gingerbread-plus-aosp

* commit '7fa693740756123fa9d05e62fb47aae5d703c71d':
  Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.
2010-10-04 11:22:22 -07:00
Andreas Huber
a4953b9f5d Merge "Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping." into gingerbread 2010-10-04 11:20:21 -07:00
Dirk Dougherty
3a55bf56a6 am 30f57295: am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.
Merge commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc' into gingerbread-plus-aosp

* commit '30f572956ef92e8636772be7bd5d0150cf7fd1fc':
  Doc change: update screens support table and remove outdated density/size metrics.
2010-10-04 11:16:12 -07:00
Dirk Dougherty
96bd7ceaef am ba944ccd: Doc change: update screens support table and remove outdated density/size metrics.
Merge commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1' into gingerbread

* commit 'ba944ccda3d61ccbe6061277fcc50c96fe2643f1':
  Doc change: update screens support table and remove outdated density/size metrics.
2010-10-04 11:12:07 -07:00
Mindy Pereira
dcd7d85a70 am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '106950f20bd352ed72ddf4490b2e19d305e36a74' into gingerbread-plus-aosp

* commit '106950f20bd352ed72ddf4490b2e19d305e36a74':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
2010-10-04 10:13:32 -07:00
Mindy Pereira
1da40fbd47 Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 2010-10-04 10:10:06 -07:00
Daisuke Miyakawa
e09a54e3cb am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge
2010-10-04 08:36:27 -07:00
Daisuke Miyakawa
255f7cb02a Merge "Refrain warning when not appropriate. Do not merge" into gingerbread 2010-10-04 08:31:56 -07:00
Kenny Root
d113938bf8 am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp

* commit 'b58b27142a936aa76897a7040c08b8a0989a685b':
  ZipFileRO: moar logging and wrap close
2010-10-04 07:41:11 -07:00
Kenny Root
a2b0e61228 Merge "ZipFileRO: moar logging and wrap close" into gingerbread 2010-10-04 07:28:20 -07:00
Hung-ying Tyan
01686df93b am 5cab38ba: Merge "SIP: minor fixes." into gingerbread
Merge commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb' into gingerbread-plus-aosp

* commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb':
  SIP: minor fixes.
2010-10-03 22:45:49 -07:00
Hung-ying Tyan
ae4bfa97ed Merge "SIP: minor fixes." into gingerbread 2010-10-03 22:43:28 -07:00
Brad Fitzpatrick
6b16e915fe am 83d52229: Doc fix: duplicate word \'of\'
Merge commit '83d522290e56f614d0d9373d47c2b54b9e207795' into gingerbread-plus-aosp

* commit '83d522290e56f614d0d9373d47c2b54b9e207795':
  Doc fix: duplicate word 'of'
2010-10-03 21:13:51 -07:00
Adam Powell
ba77997e72 am 624380a1: Fix bug 3047653 - Text select handles stick around when they shouldn\'t
Merge commit '624380a14def6c2acdb473e09c36139acbcefbf9' into gingerbread-plus-aosp

* commit '624380a14def6c2acdb473e09c36139acbcefbf9':
  Fix bug 3047653 - Text select handles stick around when they shouldn't
2010-10-02 18:36:27 -07:00
Adam Powell
ee115471a3 am 03876c90: Fix text anchor fade-out positioning
Merge commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab' into gingerbread-plus-aosp

* commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab':
  Fix text anchor fade-out positioning
2010-10-02 17:49:07 -07:00
Adam Powell
3c975e4844 am ea32f94e: Fix bug 3058082 - text anchor positioning within moving dialogs
Merge commit 'ea32f94ec4c14fe21b536139762c5332d1b5484c' into gingerbread-plus-aosp

* commit 'ea32f94ec4c14fe21b536139762c5332d1b5484c':
  Fix bug 3058082 - text anchor positioning within moving dialogs
2010-10-02 16:59:42 -07:00
Adam Powell
9e63fdd01a am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field
Merge commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db' into gingerbread-plus-aosp

* commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db':
  Fix bug 3024080 - Date picker month field uses numeric text field
2010-10-02 13:07:56 -07:00
Jeff Brown
e8d5136fec am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp

* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
  Wait for initial device scan to finish before updating config.
2010-10-01 19:03:42 -07:00
Jeff Brown
715c224997 am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp

* commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
  Minor logging changes to input dispatcher to help with debugging.
2010-10-01 19:01:14 -07:00
Jeff Brown
e8914cec61 Merge "Wait for initial device scan to finish before updating config." into gingerbread 2010-10-01 19:01:11 -07:00
Jeff Brown
f1aa6a1d6c Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 2010-10-01 18:58:32 -07:00
Jeff Brown
1ad00e96fe Wait for initial device scan to finish before updating config.
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.

Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
2010-10-01 18:55:43 -07:00
Hung-ying Tyan
c493b5d368 am 306137d9: SIP telephony cleanup.
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp

* commit '306137d97f40a4f807c54a75210343c9262360d1':
  SIP telephony cleanup.
2010-10-01 18:32:03 -07:00
Kenny Root
dbf6f272a2 ZipFileRO: moar logging and wrap close
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.

Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.

Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
2010-10-01 18:30:59 -07:00
Jake Hamby
daaa92a19f am 7888486d: Merge "Add subaddress to SMS fingerprint calculation."
Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp

* commit '7888486d1c930301535069bd90bb0bf3525b2bb5':
  Add subaddress to SMS fingerprint calculation.
2010-10-01 18:13:58 -07:00
Jeff Brown
2806e381cf Minor logging changes to input dispatcher to help with debugging.
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.

Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0
2010-10-01 18:05:13 -07:00
Jake Hamby
f91f4d912f Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
James Dong
71f07eecab am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
Merge commit '6c609b6a60e533a93c6d0088222bd8da209b9953' into gingerbread-plus-aosp

* commit '6c609b6a60e533a93c6d0088222bd8da209b9953':
  Turn off media time adjustment by default
2010-10-01 17:32:16 -07:00
James Dong
db193288b2 Merge "Turn off media time adjustment by default" into gingerbread 2010-10-01 17:27:51 -07:00
Dianne Hackborn
373111b5e5 am 14e7d693: Merge "Some documentation fixes." into gingerbread
Merge commit '14e7d693415832a974abc298124a6a5797d49a04' into gingerbread-plus-aosp

* commit '14e7d693415832a974abc298124a6a5797d49a04':
  Some documentation fixes.
2010-10-01 17:02:18 -07:00
Dianne Hackborn
5eb17e6029 Merge "Some documentation fixes." into gingerbread 2010-10-01 16:46:29 -07:00
Jeff Brown
bd432d4619 am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
Merge commit '9e32a438fd87180692da55197972ecddb1a731d9' into gingerbread-plus-aosp

* commit '9e32a438fd87180692da55197972ecddb1a731d9':
  Support haptic feedback for virtual keys defined in key layout.
2010-10-01 16:16:23 -07:00
Chia-chi Yeh
758e48f61f am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
Merge commit '9430f9d37ec169ce0654bc8950adb66ac974b761' into gingerbread-plus-aosp

* commit '9430f9d37ec169ce0654bc8950adb66ac974b761':
  KeyStore: Update the parameters of generating master keys.
2010-10-01 16:16:17 -07:00
Jeff Brown
5629ea8fda Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread 2010-10-01 16:09:58 -07:00
Jake Hamby
562108c8bf am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."
Merge commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp

* commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
  Do not explicity disconnect Data during power down for 1x.
2010-10-01 16:02:16 -07:00
Scott Main
aa0178680f am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1
Merge commit '91b0bc2a282f63f0ee532b5748c210bb67ba6fb3' into gingerbread-plus-aosp

* commit '91b0bc2a282f63f0ee532b5748c210bb67ba6fb3':
  docs: device dashboard update for 10/1
2010-10-01 15:56:08 -07:00
Hung-ying Tyan
bd434f9205 am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp

* commit '10e2120bdd2d99e100db187d49ac6a8495c7f956':
  Add CallManager/Phone.setEchoSuppressionEnabled().
2010-10-01 15:56:02 -07:00
Adam Powell
5f07bee454 am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread
Merge commit '98f310879790a98c4c24cd06677e08bf49f1cea0' into gingerbread-plus-aosp

* commit '98f310879790a98c4c24cd06677e08bf49f1cea0':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.
2010-10-01 15:55:44 -07:00
Chia-chi Yeh
533ca9650a Merge "KeyStore: Update the parameters of generating master keys." into gingerbread 2010-10-01 15:34:43 -07:00
Kenny Root
d9018f0933 am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp

* commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486':
  Add "none" for vold and deprecate mkobb -c
2010-10-01 15:11:22 -07:00
Scott Main
e0033c246d am 32441bbe: docs: device dashboard update for 10/1
Merge commit '32441bbe61e2f02f09a319c00895aef8cfc27ff4' into gingerbread

* commit '32441bbe61e2f02f09a319c00895aef8cfc27ff4':
  docs: device dashboard update for 10/1
2010-10-01 15:11:10 -07:00
Jeff Brown
956c0fb238 Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
2010-10-01 15:08:56 -07:00
Jake Hamby
f8bc8a30f2 Merge "Do not explicity disconnect Data during power down for 1x." 2010-10-01 15:02:32 -07:00
Hung-ying Tyan
aa2d67d4b7 Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread 2010-10-01 14:52:00 -07:00
Adam Powell
0cb6b18839 Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread 2010-10-01 14:46:40 -07:00
Dianne Hackborn
7502ebeb17 am fd57416c: Fix build.
Merge commit 'fd57416cc8c2a333f46cacad6de48a3b1547eac9' into gingerbread-plus-aosp

* commit 'fd57416cc8c2a333f46cacad6de48a3b1547eac9':
  Fix build.
2010-10-01 14:21:32 -07:00