ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
20,978 Commits 2 Branches 0 Tags 54 MiB
825577f81b
Commit Graph

20978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wang
825577f81b am e92fdd26: am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread 
Merge commit 'e92fdd261eed516a8821675ceca971d1c90d772b'

* commit 'e92fdd261eed516a8821675ceca971d1c90d772b':
  Return immutable copies of private callList.
 2010-09-15 07:09:00 -07:00
Leon Scroggins III
859c074c02 am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo 
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'

* commit '720d5985f5d31912c97b7e549230d241e58c1298':
  Add an option to hide the Voice Search icon.
 2010-09-15 07:08:49 -07:00
Hung-ying Tyan
d0def4800f am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread 
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'

* commit '188a8f1b72452bc294daa2186e93771543be0478':
  SipService: ignore connect event for non-active networks.
 2010-09-15 07:08:38 -07:00
Dirk Dougherty
39f77068e7 am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'

* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-15 07:08:23 -07:00
Kenny Root
be42f39a04 am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread 
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'

* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
  Dedupe timestamp in PackageSettings
 2010-09-15 07:08:15 -07:00
Hung-ying Tyan
48d9424e81 am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError() 
Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'

* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
  SipAudioCall: use SipErrorCode instead of string in onError()
 2010-09-15 07:08:04 -07:00
Hung-ying Tyan
3d4315b7f1 am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip 
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'

* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
  SIP: remove dependency on javax.sip
 2010-09-15 07:07:56 -07:00
Chung-yih Wang
86fd95efc4 am 316e72cb: am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread 
Merge commit '316e72cb05637735c67ae02911dd0dbe096c71f5'

* commit '316e72cb05637735c67ae02911dd0dbe096c71f5':
  Fix the bug of authentication in an outgoing call.
 2010-09-15 07:07:47 -07:00
Jaikumar Ganesh
b03b3c6778 am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService. 
Merge commit 'b390728b54805ecba3e0690edf2b83b60933e6a7'

* commit 'b390728b54805ecba3e0690edf2b83b60933e6a7':
  Fix interaction between BluetoothEventLoop and BluetoothService.
 2010-09-15 07:07:38 -07:00
Hung-ying Tyan
fa1cec901a am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread 
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'

* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
  SipService: deliver connectivity change to all sessions.
 2010-09-15 07:07:19 -07:00
Nipun Kwatra
6cff3123d4 Merge "Added command type to play recording sound." 2010-09-14 17:48:02 -07:00
Vasu Nori
433a2af7e2 Merge "fix bugs in exception throwing code in native_fillwindow" 2010-09-14 16:40:24 -07:00
Vasu Nori
5fdec887ce Merge "change TAG value from "Cursor" to "SQLiteCursor"" 2010-09-14 16:04:26 -07:00
Jason Sams
64e113cb0c Merge "Fix partial NP2 support and restrict mipmaps and clamp modes on HW that does not support proper NP2 bug 2965170" 2010-09-14 16:02:02 -07:00
Jaikumar Ganesh
7da40628e2 Merge "Rework Bluetooth tethering networking configuration." 2010-09-14 15:27:47 -07:00
Nipun Kwatra
2db10d6697 Merge "Adding enable/disable option for sendCommand()" 2010-09-14 15:15:16 -07:00
Adam Powell
f31bcfd4db Merge "Improve ListView smooth scrolling timing" 2010-09-14 15:14:56 -07:00
Vasu Nori
9505d4d868 Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5" 2010-09-14 13:37:57 -07:00
Shimeng (Simon) Wang
bae67c69c7 Merge "Fix comment." 2010-09-14 13:37:37 -07:00
Jean-Baptiste Queru
8bb35e99d2 Merge "Manage fonts like a true product definition" 2010-09-14 13:17:18 -07:00
Alex Sakhartchouk
2ac4ace15e Merge "Shader changes to allow for more flexible constant binding." 2010-09-14 11:39:53 -07:00
Maksymilian Osowski
be161d1f02 Merge "Changed Summarizer to add header before printing the path in summary.txt and details.html" 2010-09-14 10:37:46 -07:00
John Wang
5b86c15a4b am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread 
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp

* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
  Return immutable copies of private callList.
 2010-09-14 10:31:45 -07:00
John Wang
db608bd7d0 Merge "Return immutable copies of private callList." into gingerbread 2010-09-14 10:28:33 -07:00
Leon Scroggins III
e95f395c15 am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo 
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
 2010-09-14 10:26:44 -07:00
Leon Scroggins III
efe02e796b am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo 
Merge commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9' into gingerbread

* commit 'ca8f3d04284a26477257a0c2b34d83c86d15efe9':
  Add an option to hide the Voice Search icon.
 2010-09-14 10:23:35 -07:00
Steve Block
b14bddabe6 Merge "Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2" 2010-09-14 10:21:30 -07:00
Leon Scroggins III
b0d30a12a0 Merge "Add an option to hide the Voice Search icon." into froyo 2010-09-14 10:21:25 -07:00
Maksymilian Osowski
0a7684fdbd Merge "Made the run_layout_tests.py script restart the apache2 server before it starts." 2010-09-14 10:04:23 -07:00
Vasu Nori
c4cb303a49 Merge "sql statement with syntax errors can leave database lock in bad state" 2010-09-14 10:04:13 -07:00
Hung-ying Tyan
fed3a15b28 am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread 
Merge commit '89a7180a242043a0b4d6695bf386c93365bf6797' into gingerbread-plus-aosp

* commit '89a7180a242043a0b4d6695bf386c93365bf6797':
  SipService: ignore connect event for non-active networks.
 2010-09-14 10:00:14 -07:00
Hung-ying Tyan
946dc2946e Merge "SipService: ignore connect event for non-active networks." into gingerbread 2010-09-14 09:57:47 -07:00
Dirk Dougherty
1ed654740c am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit 'e71396cf4704ee9e26f510b511c1e793d8048d83' into gingerbread-plus-aosp

* commit 'e71396cf4704ee9e26f510b511c1e793d8048d83':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-14 09:46:44 -07:00
Kenny Root
1bf8fd86c2 am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread 
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp

* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
  Dedupe timestamp in PackageSettings
 2010-09-14 09:46:40 -07:00
Hung-ying Tyan
18747f78c6 am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError() 
Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
  SipAudioCall: use SipErrorCode instead of string in onError()
 2010-09-14 09:44:03 -07:00
Hung-ying Tyan
77d35e00bc am 99bf4e45: SIP: remove dependency on javax.sip 
Merge commit '99bf4e45c4566172189735b34b368b76660ca57a' into gingerbread-plus-aosp

* commit '99bf4e45c4566172189735b34b368b76660ca57a':
  SIP: remove dependency on javax.sip
 2010-09-14 09:43:54 -07:00
Chung-yih Wang
55711d5b9c am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread 
Merge commit '5dde95b8fe0fea1a115a68f8acf826371da89da7' into gingerbread-plus-aosp

* commit '5dde95b8fe0fea1a115a68f8acf826371da89da7':
  Fix the bug of authentication in an outgoing call.
 2010-09-14 09:43:46 -07:00
Jaikumar Ganesh
16a1e21491 am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService. 
Merge commit 'a224f70b1efc29d9698da5b5c143251a43838f2b' into gingerbread-plus-aosp

* commit 'a224f70b1efc29d9698da5b5c143251a43838f2b':
  Fix interaction between BluetoothEventLoop and BluetoothService.
 2010-09-14 09:43:31 -07:00
Hung-ying Tyan
9e0d33cebd am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread 
Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
  SipService: deliver connectivity change to all sessions.
 2010-09-14 09:43:17 -07:00
Dirk Dougherty
473273b821 am 4b4af990: Doc change: update ADT 0.9.8 checksum and size. 
Merge commit '4b4af990af527c79073d546ead1850278caa7a8e' into gingerbread

* commit '4b4af990af527c79073d546ead1850278caa7a8e':
  Doc change: update ADT 0.9.8 checksum and size.
 2010-09-14 09:39:59 -07:00
Kenny Root
cc16981410 Merge "Dedupe timestamp in PackageSettings" into gingerbread 2010-09-14 09:29:48 -07:00
Steve Block
84dbad060f Merge "Sort LayoutTestController methods alphabetically" 2010-09-14 08:25:26 -07:00
Mike Lockwood
d54bb7441a Merge changes I28b846a3,Ifd9b48cb 
* changes:
  MediaScanner: Fix problems with scanner non-file objects from the database
  MTP: Delete all files and subdirectories when deleting directories.
 2010-09-14 08:05:29 -07:00
Steve Block
23d4f894a4 Merge "Add to DumpRenderTree2 the option to suppress showing results in the host browser" 2010-09-14 06:27:08 -07:00
Maksymilian Osowski
bd0cf1883d Merge "Gets rid of flickering when executing tests." 2010-09-14 06:24:08 -07:00
Chung-yih Wang
9ee8b4325f Merge "Fix the bug of authentication in an outgoing call." into gingerbread 2010-09-13 23:31:18 -07:00
Dianne Hackborn
731a10b47f resolved conflicts for merge of 6421ae7e to master 
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
 2010-09-13 21:41:57 -07:00
Hung-ying Tyan
b408acba18 Merge "SipService: deliver connectivity change to all sessions." into gingerbread 2010-09-13 19:53:58 -07:00
Dianne Hackborn
21ccd0138f am 527c0283: am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 
Merge commit '527c02838bed1188b9211752b4cf2fc0c03e8202'

* commit '527c02838bed1188b9211752b4cf2fc0c03e8202':
  Work on issue #2991868: A toast pops up informing users...
 2010-09-13 18:58:20 -07:00
Adam Powell
9af9929125 Merge "Fix bug 2995805 - splitMotionEvents behavior change" 2010-09-13 18:18:47 -07:00