frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp	Jake Hamby	2010-09-30	3	-7/+7
\|\
\| *	Typo fixes in comments and minor code cleanups.	Jake Hamby	2010-09-30	3	-7/+7
* \|	am 0e412304: Catch exceptions in SipPhone.canTake().	Hung-ying Tyan	2010-09-30	1	-8/+26
\|\ \ \| \|/
\| *	Catch exceptions in SipPhone.canTake().	Hung-ying Tyan	2010-09-30	1	-8/+26
* \|	am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.	Hung-ying Tyan	2010-09-30	1	-11/+21
\|\ \ \| \|/
\| *	SipPhone: revise hangup() in SipCall and SipConnection.	Hung-ying Tyan	2010-09-30	1	-11/+21
* \|	am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP ca...	David Brown	2010-09-29	1	-14/+80
\|\ \ \| \|/
\| *	Implement contacts lookup (caller-id) for incoming SIP calls.	David Brown	2010-09-28	1	-14/+80
* \|	am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR	Hung-ying Tyan	2010-09-27	2	-1/+4
\|\ \ \| \|/
\| *	SIP: add DisconnectCause.SERVER_ERROR	Hung-ying Tyan	2010-09-28	2	-1/+4
* \|	am 24547592: Fix the startAudio order for 3-way calls.	Chung-yih Wang	2010-09-27	1	-2/+2
\|\ \ \| \|/
\| *	Fix the startAudio order for 3-way calls.	Chung-yih Wang	2010-09-28	1	-2/+2
* \|	am 368d796e: Fix build.	Hung-ying Tyan	2010-09-27	1	-1/+1
\|\ \ \| \|/
\| *	Fix build.	Hung-ying Tyan	2010-09-28	1	-1/+1
* \|	am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection...	Hung-ying Tyan	2010-09-27	1	-14/+21
\|\ \ \| \|/
\| *	Don't enter DISCONNECTING state when the call/connection is not alive	Hung-ying Tyan	2010-09-28	1	-14/+21
* \|	am 025a39af: SIP: misc fixes	Hung-ying Tyan	2010-09-27	1	-0/+3
\|\ \ \| \|/
\| *	SIP: misc fixes	Hung-ying Tyan	2010-09-28	1	-0/+3
* \|	am 00a22064: SipService: handle cross-domain authentication error	Hung-ying Tyan	2010-09-27	2	-0/+4
\|\ \ \| \|/
\| *	SipService: handle cross-domain authentication error	Hung-ying Tyan	2010-09-27	2	-0/+4
* \|	am bd229420: Fix the unhold issue especially if one is behind NAT.	Chung-yih Wang	2010-09-27	1	-1/+12
\|\ \ \| \|/
\| *	Fix the unhold issue especially if one is behind NAT.	Chung-yih Wang	2010-09-27	1	-1/+12
* \|	am 8f5a1211: Merge "Add debug functions." into gingerbread	John Wang	2010-09-26	1	-23/+167
\|\ \ \| \|/
\| *	Merge "Add debug functions." into gingerbread	John Wang	2010-09-26	1	-23/+167
\| \|\
\| \| *	Add debug functions.	John Wang	2010-09-26	1	-23/+167
* \| \|	am 194bbcce: SIP: longer timeout for making call, shorter for cancelling	Hung-ying Tyan	2010-09-24	1	-5/+7
\|\ \ \ \| \|/ /
\| * \|	SIP: longer timeout for making call, shorter for cancelling	Hung-ying Tyan	2010-09-25	1	-5/+7
\| \|/
* \|	am 84a357bb: Refactoring SIP classes to get ready for API review.	Hung-ying Tyan	2010-09-23	1	-12/+12
\|\ \ \| \|/
\| *	Refactoring SIP classes to get ready for API review.	Hung-ying Tyan	2010-09-24	1	-12/+12
* \|	am 4c571a62: Fix the build.	Chung-yih Wang	2010-09-20	1	-21/+0
\|\ \ \| \|/
\| *	Fix the build.	Chung-yih Wang	2010-09-21	1	-21/+0
* \|	am 708e4251: Merge "Revert the ANSWERING state." into gingerbread	Chung-yih Wang	2010-09-20	4	-30/+35
\|\ \ \| \|/
\| *	Revert the ANSWERING state.	Chung-yih Wang	2010-09-21	4	-30/+35
* \|	am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread	John Wang	2010-09-20	1	-34/+81
\|\ \ \| \|/
\| *	Merge "Use PhoneBase in the phone list." into gingerbread	John Wang	2010-09-20	1	-34/+81
\| \|\
\| \| *	Use PhoneBase in the phone list.	John Wang	2010-09-17	1	-34/+81
* \| \|	am 8544560c: SipPhone: fix missing-call DisconnectCause feedback	Hung-ying Tyan	2010-09-20	1	-1/+3
\|\ \ \ \| \|/ /
\| * \|	SipPhone: fix missing-call DisconnectCause feedback	Hung-ying Tyan	2010-09-20	1	-1/+3
* \| \|	am 97963794: SIP: convert enum to static final int.	Hung-ying Tyan	2010-09-19	1	-19/+20
\|\ \ \ \| \|/ /
\| * \|	SIP: convert enum to static final int.	Hung-ying Tyan	2010-09-20	1	-19/+20
\| \|/
* \|	am 0741a5ed: Merge "Add debug function." into gingerbread	John Wang	2010-09-17	1	-5/+56
\|\ \ \| \|/
\| *	Add debug function.	John Wang	2010-09-17	1	-5/+56
* \|	am 1d158357: SipPhone: do not append SIP domain to PSTN number	Hung-ying Tyan	2010-09-17	1	-19/+28
\|\ \ \| \|/
\| *	SipPhone: do not append SIP domain to PSTN number	Hung-ying Tyan	2010-09-17	1	-19/+28
* \|	am afa583e6: SipAudioCall: expose startAudio()	Hung-ying Tyan	2010-09-17	1	-0/+1
\|\ \ \| \|/
\| *	SipAudioCall: expose startAudio()	Hung-ying Tyan	2010-09-17	1	-0/+1
* \|	am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread	Hung-ying Tyan	2010-09-16	1	-4/+5
\|\ \ \| \|/
\| *	Add timer to SIP session creation process.	Hung-ying Tyan	2010-09-17	1	-4/+5
* \|	am d8f3d167: Add a new phone state ANSWERING.	Chung-yih Wang	2010-09-16	4	-4/+23
\|\ \ \| \|/
\| *	Add a new phone state ANSWERING.	Chung-yih Wang	2010-09-16	4	-4/+23