27721 Commits

Author SHA1 Message Date
Kenny Root
ac7540733c 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
b58b27142a Merge "ZipFileRO: moar logging and wrap close" into gingerbread 2010-10-04 07:28:20 -07:00
Hung-ying Tyan
1f34ffd7e3 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
5cab38ba11 Merge "SIP: minor fixes." into gingerbread 2010-10-03 22:43:28 -07:00
Brad Fitzpatrick
3d019a374f 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
Brad Fitzpatrick
83d522290e Doc fix: duplicate word 'of'
Change-Id: I45a4ca443becc2f2cf02cbca2bd61ef2ee590b5c
2010-10-03 21:07:21 -07:00
Hung-ying Tyan
9ea96c6cad SIP: minor fixes.
+ Log error instead of crashing app process in SipManager's ListenerRelay.
+ Terminate dialog and transaction in SipSessionGroup.reset().
+ Remove redundant reset() in SipSessionGroup.

Change-Id: Ifbf29d2c9607ffe1a1a50b0c131ee3a4e81a0d0e
2010-10-04 08:07:42 +08:00
Adam Powell
7e53f3d709 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
624380a14d Fix bug 3047653 - Text select handles stick around when they shouldn't
Text select handles will now fade out on their own after a few seconds
since many apps expect a selection to be persistent while a text field
stays focused in touch mode. The user may tap within the selection to
bring the anchors back.

Text select handles will also disappear upon leaving touch mode.

Fix a bug that impaired cut/paste from the context menu.

Change-Id: I8f431e2d261aec02581150125d11324a3ee11656
2010-10-02 18:31:38 -07:00
Adam Powell
077c79cb43 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
03876c905f Fix text anchor fade-out positioning
Change-Id: I5660481fb883c28c88e384be2f26e67aa854ec8e
2010-10-02 17:44:47 -07:00
Adam Powell
0d843dc479 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
ea32f94ec4 Fix bug 3058082 - text anchor positioning within moving dialogs
Change-Id: I8f0b515c73d2b3055b4072425418f837eb021d4f
2010-10-02 16:51:36 -07:00
Adam Powell
53303da0a7 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
Adam Powell
8bcbebd417 Fix bug 3024080 - Date picker month field uses numeric text field
NumberPicker now uses text entry when displayed value strings are
provided.

Change-Id: I555a7d6b64ad6a5af131b3e1d8c638dcdb00d02c
2010-10-02 12:52:28 -07:00
Jeff Brown
ea58d1bac2 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
e11b76d3ef 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
e951ef07dd Merge "Wait for initial device scan to finish before updating config." into gingerbread 2010-10-01 19:01:11 -07:00
Jeff Brown
f6295b35db Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 2010-10-01 18:58:32 -07:00
Jeff Brown
7342bb9693 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
8788d14036 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
6cb241f902 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
3543a40b24 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
f2f4871830 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
7888486d1c Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
James Dong
2bf74b8f0a 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
Hung-ying Tyan
306137d97f SIP telephony cleanup.
+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.

Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
2010-10-02 08:30:48 +08:00
James Dong
6c609b6a60 Merge "Turn off media time adjustment by default" into gingerbread 2010-10-01 17:27:51 -07:00
James Dong
9160e4aa2a Turn off media time adjustment by default
Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
2010-10-01 17:14:23 -07:00
Dianne Hackborn
9e1556de83 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
14e7d69341 Merge "Some documentation fixes." into gingerbread 2010-10-01 16:46:29 -07:00
Jeff Brown
57fa3e8b4c 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
a4f1eb3d77 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
9e32a438fd Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread 2010-10-01 16:09:58 -07:00
Jake Hamby
edec27a1e9 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
de5e6afb01 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
86a12d465f 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
bbf00cfbdd 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
9430f9d37e Merge "KeyStore: Update the parameters of generating master keys." into gingerbread 2010-10-01 15:34:43 -07:00
Kenny Root
7e40e67f73 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
91b0bc2a28 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
0eaf3931a3 Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
2010-10-01 15:08:56 -07:00
Jake Hamby
d531c9ebe1 Merge "Do not explicity disconnect Data during power down for 1x." 2010-10-01 15:02:32 -07:00
Hung-ying Tyan
10e2120bdd Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread 2010-10-01 14:52:00 -07:00
Adam Powell
98f3108797 Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread 2010-10-01 14:46:40 -07:00
Adam Powell
a57ae3f438 DO NOT MERGE Fix bug 3026771, other design/asset fixes.
* Button text changed to bold by default.
* Change notification divider to lighter gray (new asset).
* Change "Clear" notification button to use system small button assets.

Change-Id: Id1f1bdcf8c034186ad9acbdbdd544546bd32bbd8
2010-10-01 14:35:22 -07:00
Dianne Hackborn
007d5b2cf6 am fd57416c: Fix build.
Merge commit 'fd57416cc8c2a333f46cacad6de48a3b1547eac9' into gingerbread-plus-aosp

* commit 'fd57416cc8c2a333f46cacad6de48a3b1547eac9':
  Fix build.
2010-10-01 14:21:32 -07:00
Dianne Hackborn
4d023d214d Some documentation fixes.
Change-Id: Iaae452fc1430af788ce440a043ca7fb53e667a61
2010-10-01 14:07:54 -07:00
Kenny Root
d9e88d22f0 Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread 2010-10-01 14:06:46 -07:00
Dianne Hackborn
fd57416cc8 Fix build.
Change-Id: I99d362e6673252ade4da29f29852eccaedbc9709
2010-10-01 14:04:27 -07:00