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
Stephen Hines
c40c7fee0c
Merge "Support for 64-bit integer type."
2010-10-01 17:46:37 -07:00
James Dong
7245078ac0
am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread
...
Merge commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2'
* commit '2bf74b8f0ad59b1379534e760a356adeb3673fd2':
Turn off media time adjustment by default
2010-10-01 17:35:40 -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
Adam Cohen
a81f1f6f43
Merge "Added looping parameter to AdapterViewAnimator / StackView"
2010-10-01 17:23:08 -07:00
Dianne Hackborn
37f060900d
am 9e1556de: am 14e7d693: Merge "Some documentation fixes." into gingerbread
...
Merge commit '9e1556de8382c3eb68d324a7ef559b2cde1b3d6c'
* commit '9e1556de8382c3eb68d324a7ef559b2cde1b3d6c':
Some documentation fixes.
2010-10-01 17:11:41 -07:00
Jeff Brown
4adce423e4
am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread
...
Merge commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f'
* commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f':
Support haptic feedback for virtual keys defined in key layout.
2010-10-01 17:08:34 -07:00
Chia-chi Yeh
58addfd94b
am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread
...
Merge commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4'
* commit 'a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4':
KeyStore: Update the parameters of generating master keys.
2010-10-01 17:08:30 -07:00
Jake Hamby
a0380fb6c5
am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."
...
Merge commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9'
* commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9':
Do not explicity disconnect Data during power down for 1x.
2010-10-01 17:07:58 -07:00
Scott Main
2f093cde63
am de5e6afb: am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1
...
Merge commit 'de5e6afb01b630dfa279c6fc89ce6cab345315a6'
* commit 'de5e6afb01b630dfa279c6fc89ce6cab345315a6':
docs: device dashboard update for 10/1
2010-10-01 17:07:53 -07:00
Hung-ying Tyan
2455dce6a0
am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
...
Merge commit '86a12d465fca7d25d99a788abda33fde5154a739'
* commit '86a12d465fca7d25d99a788abda33fde5154a739':
Add CallManager/Phone.setEchoSuppressionEnabled().
2010-10-01 17:07:48 -07:00
Adam Powell
7960b17ab1
am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread
...
Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'
* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
DO NOT MERGE Fix bug 3026771, other design/asset fixes.
2010-10-01 17:07:43 -07:00
Kenny Root
569c5d1f09
am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
...
Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039'
* commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039':
Add "none" for vold and deprecate mkobb -c
2010-10-01 17:07:21 -07:00
Dianne Hackborn
5a8176d485
am 007d5b2c: am fd57416c: Fix build.
...
Merge commit '007d5b2cf6af32dfe96c0c04988d090b872afb01'
* commit '007d5b2cf6af32dfe96c0c04988d090b872afb01':
Fix build.
2010-10-01 17:07:09 -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
Dianne Hackborn
cbe29a0ccd
Merge "resolved conflicts for merge of 4d28e8c5 to master"
2010-10-01 16:46:06 -07:00
Dianne Hackborn
07df65ab5e
resolved conflicts for merge of 4d28e8c5 to master
...
Change-Id: I2449488a84e44b3fb5f820b50951b2b2bfa3bcbf
2010-10-01 16:44:12 -07:00
Romain Guy
2955f28a43
Merge "Apply bilinear filtering to text."
2010-10-01 16:37:52 -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
Alex Sakhartchouk
a53935af51
Merge "Fix for bug 3053078 Font gamma correction to match with lib HWUI."
2010-10-01 16:13:10 -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
Alex Sakhartchouk
28ba3ad58b
Merge "fixing bugs 3053960, 3044804, 3044798 shader cleanup and removing unnecessary state setup."
2010-10-01 15:03:12 -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
Amith Yamasani
2db993bef9
Merge "3012761 Please fix problems with your strings"
2010-10-01 14:32:59 -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
Steve Howard
2438baba54
am e468a4bc: am 751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread
...
Merge commit 'e468a4bc74f1b241b3de09ea99251a419e40c6d3'
* commit 'e468a4bc74f1b241b3de09ea99251a419e40c6d3':
A few additions to the download manager public API documentation
2010-10-01 14:19:09 -07:00
Kenny Root
45c396e868
Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
2010-10-01 14:06:46 -07:00
Brad Fitzpatrick
e9f1281c74
resolved conflicts for merge of 6718b365 to master
...
Change-Id: I32762a4a3b00856f6765d50667b667264a385fc6
2010-10-01 13:57:04 -07:00
Dianne Hackborn
0292254793
am 1fa69735: Merge "Fix issue #3037083 : Problem report for Pinball" into gingerbread
...
Merge commit '1fa69735d9e786da4b20c3ab3da3aa66f3cf8116' into gingerbread-plus-aosp
* commit '1fa69735d9e786da4b20c3ab3da3aa66f3cf8116':
Fix issue #3037083 : Problem report for Pinball
2010-10-01 13:42:40 -07:00
Dianne Hackborn
9e4b567105
Merge "Fix issue #3037083 : Problem report for Pinball" into gingerbread
2010-10-01 13:39:39 -07:00
Steve Howard
baf1165ecb
am 751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread
...
Merge commit '751b47313886264e1229ab67184c9771424be402' into gingerbread-plus-aosp
* commit '751b47313886264e1229ab67184c9771424be402':
A few additions to the download manager public API documentation
2010-10-01 13:16:17 -07:00
Steve Howard
87548ede54
Merge "A few additions to the download manager public API documentation" into gingerbread
2010-10-01 13:12:39 -07:00
Brad Fitzpatrick
9562f7abca
am 32e60c79: Update StrictMode\'s public API.
...
Merge commit '32e60c7942eeba920ec5c27b372ec0899fd75a20' into gingerbread-plus-aosp
* commit '32e60c7942eeba920ec5c27b372ec0899fd75a20':
Update StrictMode's public API.
2010-10-01 13:05:02 -07:00
Wei-Ta Chen
30903b5e20
am eeac43ad: (-s ours) am f7681f84: Do not merge.
...
Merge commit 'eeac43ad3c9b41c1679f3ab36064fa611106faf2'
* commit 'eeac43ad3c9b41c1679f3ab36064fa611106faf2':
Do not merge.
2010-10-01 12:39:42 -07:00