ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,261 Commits 2 Branches 0 Tags 54 MiB
8c4edc02d5
Commit Graph

22261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3d20bc9ff6 am ac754073: am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread 
Merge commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583'

* commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583':
  ZipFileRO: moar logging and wrap close
 2010-10-04 07:54:06 -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
43e0cc43ed am 1f34ffd7: am 5cab38ba: Merge "SIP: minor fixes." into gingerbread 
Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99'

* commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99':
  SIP: minor fixes.
 2010-10-03 22:49:09 -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
733eeb1711 am 3d019a37: am 83d52229: Doc fix: duplicate word \'of\' 
Merge commit '3d019a374fa41a11fb7b718770076e61235d1c45'

* commit '3d019a374fa41a11fb7b718770076e61235d1c45':
  Doc fix: duplicate word 'of'
 2010-10-03 21:19:12 -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
Romain Guy
17921ae553 Merge "Initialize font texture cache." 2010-10-03 14:40:12 -07:00
Adam Powell
68886615af am 7e53f3d7: am 624380a1: Fix bug 3047653 - Text select handles stick around when they shouldn\'t 
Merge commit '7e53f3d70994cfef255953e1df1881d057477d06'

* commit '7e53f3d70994cfef255953e1df1881d057477d06':
  Fix bug 3047653 - Text select handles stick around when they shouldn't
 2010-10-02 18:39:13 -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
f7a6b39d0b am 077c79cb: am 03876c90: Fix text anchor fade-out positioning 
Merge commit '077c79cb43c3b6059a92ba1eb51af94972adadef'

* commit '077c79cb43c3b6059a92ba1eb51af94972adadef':
  Fix text anchor fade-out positioning
 2010-10-02 17:51:37 -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
527210dbd3 am 0d843dc4: am ea32f94e: Fix bug 3058082 - text anchor positioning within moving dialogs 
Merge commit '0d843dc47929ff6e3dbaa4cc1d07de7fbdba8506'

* commit '0d843dc47929ff6e3dbaa4cc1d07de7fbdba8506':
  Fix bug 3058082 - text anchor positioning within moving dialogs
 2010-10-02 17:04:01 -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
c0d691011e am 53303da0: am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field 
Merge commit '53303da0a78da2042ec60226ee290d2c903e6023'

* commit '53303da0a78da2042ec60226ee290d2c903e6023':
  Fix bug 3024080 - Date picker month field uses numeric text field
 2010-10-02 13:18:49 -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
c0242197ea am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread 
Merge commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1'

* commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1':
  Wait for initial device scan to finish before updating config.
 2010-10-01 21:49:39 -07:00
Jeff Brown
76025e44e4 am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 
Merge commit 'e11b76d3efb056edea301d53a354d0730adf3520'

* commit 'e11b76d3efb056edea301d53a354d0730adf3520':
  Minor logging changes to input dispatcher to help with debugging.
 2010-10-01 21:49:29 -07:00
Hung-ying Tyan
711a0adebc resolved conflicts for merge of 8788d140 to master 
Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
 2010-10-02 12:42:23 +08: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
Jake Hamby
033091e4b3 resolved conflicts for merge of 3543a40b to master 
Change-Id: I307c8f1277b84763e537ced0ac3410ec06fce431
 2010-10-01 18:35:13 -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
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