frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Move the "voice_capable" resource into the framework."	David Brown	2010-08-18	1	-0/+21
\|\
\| *	Move the "voice_capable" resource into the framework.	David Brown	2010-08-18	1	-0/+21
* \|	am fa9a38c5: am 6ab94608: Merge "CallManager: add setAudioMode()" into ginger...	Hung-ying Tyan	2010-08-18	1	-4/+29
\|\ \
\| * \	am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread	Hung-ying Tyan	2010-08-18	1	-4/+29
\| \|\ \
\| \| * \|	CallManager: add setAudioMode()	Hung-ying Tyan	2010-08-18	1	-4/+29
* \| \| \|	am dc7d7378: am 8eac20ea: SIP: implement conference call	Hung-ying Tyan	2010-08-18	2	-5/+51
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 8eac20ea: SIP: implement conference call	Hung-ying Tyan	2010-08-18	2	-5/+51
\| \|\ \ \ \| \| \|/ /
\| \| * \|	SIP: implement conference call	Hung-ying Tyan	2010-08-18	2	-5/+51
* \| \| \|	am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg...	Hung-ying Tyan	2010-08-18	1	-1/+4
\|\ \ \ \ \| \|/ / / \| \| \| / \| \|_\|/ \|/\| \|
\| * \|	am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live...	Hung-ying Tyan	2010-08-18	1	-1/+4
\| \|\ \ \| \| \|/
\| \| *	CallManager: do not deliver ring event if fg call is live.	Hung-ying Tyan	2010-08-17	1	-1/+4
* \| \|	Merge "Add setRadioState to MockRilController and the corresponding test case...	Xia Wang	2010-08-18	3	-0/+63
\|\ \ \
\| * \| \|	Add setRadioState to MockRilController and the corresponding test case.	Xia Wang	2010-08-09	3	-0/+63
* \| \| \|	resolved conflicts for merge of 31202b1a to master	Jake Hamby	2010-08-16	5	-17/+215
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with te...	Jake Hamby	2010-08-13	6	-23/+220
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Fix character count bug and Javadoc typos in SMS (with test cases)	Jake Hamby	2010-08-13	6	-23/+220
* \| \| \|	am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gi...	Jake Hamby	2010-08-16	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread	Jake Hamby	2010-08-13	2	-2/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix typo and bug in CTS test class.	Jake Hamby	2010-08-13	2	-2/+1
* \| \| \|	Keep the '+' when normalizing the phone number	Dmitri Plotnikov	2010-08-13	2	-3/+4
* \| \| \|	am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gi...	John Wang	2010-08-12	4	-7/+121
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 686a9505: Merge "Update switch call and accept call." into gingerbread	John Wang	2010-08-12	4	-8/+122
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Update switch call and accept call.	John Wang	2010-08-12	4	-8/+122
* \| \| \|	am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Typ...	John Huang	2010-08-12	3	-189/+1257
\|\ \ \ \ \| \|/ / /
\| * \| \|	am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"	John Huang	2010-08-12	3	-189/+1257
\| \|\ \ \
\| \| * \ \	Merge "Enhance WspTypeDecoder to decode Content Type Parameters"	John Huang	2010-08-12	3	-189/+1257
\| \| \|\ \ \
\| \| \| * \| \|	Enhance WspTypeDecoder to decode Content Type Parameters	Dan Griffin	2010-08-02	3	-189/+1257
* \| \| \| \| \|	SIP: remove unused file.	Hung-ying Tyan	2010-08-12	2	-764/+1
* \| \| \| \| \|	am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent.	Naveen Kalla	2010-08-11	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am c4c4c98c: In CW Interrogation service class is not sent.	Naveen Kalla	2010-08-11	1	-1/+3
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	In CW Interrogation service class is not sent.	Naveen Kalla	2010-08-11	1	-1/+3
* \| \| \| \| \|	am 92798a48: am 076d0654: Merge "SIM toolkit enhancements and bug fixes"	Jean-Baptiste Queru	2010-08-11	5	-47/+151
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 076d0654: Merge "SIM toolkit enhancements and bug fixes"	Jean-Baptiste Queru	2010-08-11	5	-47/+151
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	SIM toolkit enhancements and bug fixes	Naveen Kalla	2010-07-30	5	-47/+151
\| * \| \| \| \|	am 1777a274: SIP: remove unused file.	Hung-ying Tyan	2010-08-11	2	-750/+1
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	SIP: remove unused file.	Hung-ying Tyan	2010-08-11	2	-750/+1
* \| \| \| \| \|	am 0a6db9be: am 2725a655: Fix a bug in unregisterPhone().	Chung-yih Wang	2010-08-10	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 2725a655: Fix a bug in unregisterPhone().	Chung-yih Wang	2010-08-10	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Fix a bug in unregisterPhone().	Chung-yih Wang	2010-08-11	1	-1/+1
* \| \| \| \| \|	am 2c9de2b9: am f57324cf: Add getSipUri() for identification.	Chung-yih Wang	2010-08-10	1	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am f57324cf: Add getSipUri() for identification.	Chung-yih Wang	2010-08-10	1	-0/+4
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Add getSipUri() for identification.	Chung-yih Wang	2010-08-11	1	-0/+4
* \| \| \| \| \|	am f13542f2: am 259b4c86: Merge "SIP: clean up unused class and fields." into...	Hung-ying Tyan	2010-08-09	1	-2/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread	Hung-ying Tyan	2010-08-09	1	-2/+0
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	SIP: clean up unused class and fields.	Hung-ying Tyan	2010-08-10	1	-2/+0
* \| \| \| \| \|	am 8b8b4536: am 8fb2e6e4: PhoneFactory: add makeSipPhone()	Hung-ying Tyan	2010-08-09	2	-32/+25
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 8fb2e6e4: PhoneFactory: add makeSipPhone()	Hung-ying Tyan	2010-08-09	2	-32/+25
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	PhoneFactory: add makeSipPhone()	Hung-ying Tyan	2010-08-09	2	-32/+25
* \| \| \| \| \|	am 51128faa: am d122805b: CallManager: add getAllPhones().	Hung-ying Tyan	2010-08-09	1	-0/+9
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	am d122805b: CallManager: add getAllPhones().	Hung-ying Tyan	2010-08-09	1	-0/+9
\| \|\ \ \ \ \| \| \|/ / /