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

22065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Howard
87ec56b453 Merge "Updated current.xml as autogenerated" 2010-09-30 14:59:15 -07:00
Dianne Hackborn
c8a2bda89b am c3bc8b7b: am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread 
Merge commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d'

* commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d':
  Fix night/notnight resource folder handling.
 2010-09-30 14:57:23 -07:00
Paul Westbrook
b5e2ae7575 am 5dcaf7b0: am fcf1948a: Moved Rfc822 validator test 
Merge commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa'

* commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa':
  Moved Rfc822 validator test
 2010-09-30 14:56:34 -07:00
Steve Howard
5a8f78123b Merge "resolved conflicts for merge of 538c3fa3 to master" 2010-09-30 14:43:53 -07:00
Steve Howard
4f0c27cb66 resolved conflicts for merge of 538c3fa3 to master 
Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014
 2010-09-30 14:41:59 -07:00
Kenny Root
1635e522e0 am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread 
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp

* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
  Fix location of gdbserver upon installation
 2010-09-30 14:30:14 -07:00
Kenny Root
9e681f5374 Merge "Fix location of gdbserver upon installation" into gingerbread 2010-09-30 14:27:15 -07:00
Jim Miller
8e1f24a12f Merge "Add new rezzing-in effect of Carousel to Recents." 2010-09-30 14:06:15 -07:00
Alex Sakhartchouk
c26b99db06 Merge "Adding anisotropic filtering and related samples." 2010-09-30 14:04:43 -07:00
Wu-cheng Li
cfc51a9ae0 am 6bbc2f15: am 2fb818ca: Fix the javadoc of Parameters.setRotation. 
Merge commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a'

* commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a':
  Fix the javadoc of Parameters.setRotation.
 2010-09-30 13:38:15 -07:00
Chia-chi Yeh
ecefe37e48 am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread 
Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e'

* commit 'ab6327bc9ab70f3b4c1f509d038474982772207e':
  KeyStore: Initialize IV correctly.
 2010-09-30 13:36:55 -07:00
Chia-chi Yeh
b1e0b9eb50 am 2b133fc0: am 21ae1ad6: RTP: Minor fixes with polishing. 
Merge commit '2b133fc07533a853f7de23da4f60a766f4233bed'

* commit '2b133fc07533a853f7de23da4f60a766f4233bed':
  RTP: Minor fixes with polishing.
 2010-09-30 13:36:50 -07:00
Chia-chi Yeh
abbb269751 am 92cb1a02: am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread 
Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b'

* commit '92cb1a026a2d6c594a63c18d8906271147eed85b':
  KeyStore: Fix the return value when send() or recv() has an error.
 2010-09-30 13:36:43 -07:00
Hung-ying Tyan
974204a35c am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 
Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3'

* commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3':
  Add uri field to SipManager.ListenerRelay
 2010-09-30 13:36:37 -07:00
Chia-chi Yeh
035a3a1524 am f6381ec1: am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 
Merge commit 'f6381ec1da1166e3350d897faae654afb2c21a5a'

* commit 'f6381ec1da1166e3350d897faae654afb2c21a5a':
  RTP: Adjust the jitter buffer to 512ms.
 2010-09-30 13:36:31 -07:00
Hung-ying Tyan
ae3a0ee607 am 34552149: am 6a53489a: SipService: add UID check. 
Merge commit '34552149e4b997d4ed3383fc153faff2bb189066'

* commit '34552149e4b997d4ed3383fc153faff2bb189066':
  SipService: add UID check.
 2010-09-30 13:36:16 -07:00
Adam Powell
0e0ede236b Merge "resolved conflicts for merge of 6e9a021e to master" 2010-09-30 13:29:36 -07:00
Mike Lockwood
06ddd4c77f am 727d67d4: Merge "location: rebind to network location and geocoder services after package update" into gingerbread 
Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp

* commit '727d67d4fb8721b0291312e4cca33927dfba0e31':
  location: rebind to network location and geocoder services after package update
 2010-09-30 13:10:50 -07:00
Adam Powell
3a473f8661 resolved conflicts for merge of 6e9a021e to master 
Change-Id: I5ea823b752e78cb9d2ef7ccec68addbaa9ca66e9
 2010-09-30 13:09:43 -07:00
Mike Lockwood
33756f1947 Merge "location: rebind to network location and geocoder services after package update" into gingerbread 2010-09-30 13:07:06 -07:00
Dianne Hackborn
df5b6d9694 am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread 
Merge commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895' into gingerbread-plus-aosp

* commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895':
  Fix night/notnight resource folder handling.
 2010-09-30 12:43:55 -07:00
Dianne Hackborn
23beef51fd Merge "Fix night/notnight resource folder handling." into gingerbread 2010-09-30 12:40:52 -07:00
Jeff Brown
cb287544d9 am 76d55a34: am 5068ad8d: Revert orientation change. 
Merge commit '76d55a3447954db97b7172d068813d02e89ba9ca'

* commit '76d55a3447954db97b7172d068813d02e89ba9ca':
  Revert orientation change.
 2010-09-30 12:02:31 -07:00
Robert Greenwalt
aade4bdb3a am aa03f13c: am e8dd7160: Merge "Change the 0_fully signal icon to the new style" into gingerbread 
Merge commit 'aa03f13c3aab16059e6e617fe510f454ed280459'

* commit 'aa03f13c3aab16059e6e617fe510f454ed280459':
  Change the 0_fully signal icon to the new style
 2010-09-30 12:02:24 -07:00
Jeff Brown
872106b65f am b8182a38: am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread 
Merge commit 'b8182a382df3efaf18c9810dd7c517b2601edadb'

* commit 'b8182a382df3efaf18c9810dd7c517b2601edadb':
  PointerLocationView: Display orientation correctly.
 2010-09-30 12:02:17 -07:00
Chia-chi Yeh
9d653873d6 am cbee6229: am 0a537b78: Merge "RTP: Enable AMR codec." into gingerbread 
Merge commit 'cbee622954de5e9e0c07557f8ec9aaa741110043'

* commit 'cbee622954de5e9e0c07557f8ec9aaa741110043':
  RTP: Enable AMR codec.
 2010-09-30 12:02:10 -07:00
Hung-ying Tyan
32dddc87b3 am 947d2abd: am 2365b78e: Merge "SIP: misc fixes." into gingerbread 
Merge commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71'

* commit '947d2abd82ef68c661fc29fd5167e4c0ba749f71':
  SIP: misc fixes.
 2010-09-30 12:02:03 -07:00
Hung-ying Tyan
b76dcfcf44 am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake(). 
Merge commit '49c13e512c675b27099783ccf2d20c9ef46c99db'

* commit '49c13e512c675b27099783ccf2d20c9ef46c99db':
  Catch exceptions in SipPhone.canTake().
 2010-09-30 12:01:56 -07:00
Hung-ying Tyan
aeec4b110b am 2c457326: am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection. 
Merge commit '2c4573263a97cc80f441824a75d6502ae04292a8'

* commit '2c4573263a97cc80f441824a75d6502ae04292a8':
  SipPhone: revise hangup() in SipCall and SipConnection.
 2010-09-30 12:01:48 -07:00
Gilles Debunne
7e07b4d988 Merge "resolved conflicts for merge of 8064dd22 to master" 2010-09-30 11:55:39 -07:00
Gilles Debunne
f23b42a9d5 resolved conflicts for merge of 8064dd22 to master 
Change-Id: Iff7f729d1e375902a8d89bb237694913380b0d36
 2010-09-30 11:50:52 -07:00
Paul Westbrook
72409a4a0b am fcf1948a: Moved Rfc822 validator test 
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp

* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
  Moved Rfc822 validator test
 2010-09-30 11:45:05 -07:00
Steve Howard
b5543cde51 am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread 
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp

* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
  Have download manager give more details when downloads are paused
 2010-09-30 11:42:16 -07:00
Ying Wang
cb090610ca am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread 
Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'

* commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6':
  Fix proguard flag file dependency.
 2010-09-30 11:27:47 -07:00
Joe Onorato
1bbdc12f25 am 9a042772: am 2a0b3c0d: Merge "AnimatedImageView: Stop the animation when we\'re not visible." into gingerbread 
Merge commit '9a042772c2d76dba3a541dc4190b7be1a438445a'

* commit '9a042772c2d76dba3a541dc4190b7be1a438445a':
  AnimatedImageView: Stop the animation when we're not visible.
 2010-09-30 11:26:02 -07:00
David Brown
375607dee4 am 5cf44f69: am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread 
Merge commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9'

* commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9':
  Implement contacts lookup (caller-id) for incoming SIP calls.
 2010-09-30 11:25:54 -07:00
Doug Zongker
062d775153 am ab9f5082: am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread 
Merge commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3'

* commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3':
  don't delete /cache/recovery/last_log on boot
 2010-09-30 11:25:26 -07:00
Jaikumar Ganesh
4a0123c3dc am c10207b6: am a5c742bf: Merge "Update local cache before sending intent." into gingerbread 
Merge commit 'c10207b6bfcfe09636dd2035b4237f1001008a48'

* commit 'c10207b6bfcfe09636dd2035b4237f1001008a48':
  Update local cache before sending intent.
 2010-09-30 11:25:18 -07:00
Steve Howard
db6a8843ef Merge "Have download manager give more details when downloads are paused" into gingerbread 2010-09-30 11:11:16 -07:00
Wu-cheng Li
2cb06ac028 am 2fb818ca: Fix the javadoc of Parameters.setRotation. 
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp

* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
  Fix the javadoc of Parameters.setRotation.
 2010-09-30 11:07:23 -07:00
Gilles Debunne
a27ddfdc79 am ed1cf3da: am f0fa2674: Merge "New assets: wifi signal 1, no sim card." into gingerbread 
Merge commit 'ed1cf3dab59d7af51240269308007546a816b1f4'

* commit 'ed1cf3dab59d7af51240269308007546a816b1f4':
  New assets: wifi signal 1, no sim card.
 2010-09-30 11:00:19 -07:00
Eric Fischer
dfd634da88 am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread 
Merge commit '97708b19c564294182558d757a871abc892d6975'

* commit '97708b19c564294182558d757a871abc892d6975':
  Split strings with SD card references into variations.
 2010-09-30 11:00:01 -07:00
Chia-chi Yeh
444b6efd94 am 1c2eab2d: am 955ab37c: Merge "RTP: Enable GSM-EFR codec." into gingerbread 
Merge commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57'

* commit '1c2eab2d86faa9c647a9893f761a50cfa28d9d57':
  RTP: Enable GSM-EFR codec.
 2010-09-30 10:59:48 -07:00
Stephen Hines
e6622bc63f Merge "Fix clear() operation for rsScriptC." 2010-09-30 10:57:17 -07:00
Chia-chi Yeh
5b0de90f96 am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbread 
Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp

* commit '20cb2310cffb787c54016d50b9b5fe320fc5b025':
  KeyStore: Initialize IV correctly.
 2010-09-30 10:11:16 -07:00
Chia-chi Yeh
06d4a936de am 21ae1ad6: RTP: Minor fixes with polishing. 
Merge commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp

* commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3':
  RTP: Minor fixes with polishing.
 2010-09-30 10:11:07 -07:00
Chia-chi Yeh
f3e1e2b617 am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread 
Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp

* commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01':
  KeyStore: Fix the return value when send() or recv() has an error.
 2010-09-30 10:10:59 -07:00
Hung-ying Tyan
eced15c440 am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 
Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp

* commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6':
  Add uri field to SipManager.ListenerRelay
 2010-09-30 10:10:52 -07:00
Chia-chi Yeh
52dd08bb76 am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 
Merge commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720' into gingerbread-plus-aosp

* commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720':
  RTP: Adjust the jitter buffer to 512ms.
 2010-09-30 10:10:46 -07:00
Hung-ying Tyan
726d8d503b am 6a53489a: SipService: add UID check. 
Merge commit '6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp

* commit '6a53489ae594d7cc373a00687d6ea2f23d0634df':
  SipService: add UID check.
 2010-09-30 10:10:41 -07:00