frameworks_base.git - frameworks base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp	Jean-Baptiste Queru	2010-11-22	11	-1/+1064
\|\
\| *	Enabling cell broadcast (SMS-CB) support in the platform.	Henrik Hall	2010-11-19	11	-1/+1064
* \|	am 27c06bab: Merge "Release reference when putting RILRequest back into the p...	Jean-Baptiste Queru	2010-11-17	1	-0/+1
\|\ \ \| \|/
\| *	Release reference when putting RILRequest back into the pool.	Johannes Carlsson	2010-10-27	1	-0/+1
* \|	am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread	John Wang	2010-11-10	1	-1/+5
\|\ \
\| * \|	Fix the audio mode glitch during hangup.	John Wang	2010-11-10	1	-1/+5
* \| \|	am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread	Eric Laurent	2010-10-26	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Partial fix for issue 3124895.	Eric Laurent	2010-10-25	1	-1/+1
* \| \|	am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into ...	John Huang	2010-10-21	1	-3/+3
\|\ \ \ \| \|/ /
\| * \|	Fix connect duration for un-established SIP calls.	Hung-ying Tyan	2010-10-21	1	-3/+3
* \| \|	am 6037a056: Fix n-way conf call in SipPhone.	Hung-ying Tyan	2010-10-20	1	-3/+20
\|\ \ \ \| \|/ /
\| * \|	Fix n-way conf call in SipPhone.	Hung-ying Tyan	2010-10-21	1	-3/+20
* \| \|	am 23392a84: Fix the build.	Jeff Hamilton	2010-10-20	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Fix the build.	Jeff Hamilton	2010-10-20	1	-1/+1
* \| \|	am 6fe795ec: Do another contact lookup if the first one fails and...	Hung-ying Tyan	2010-10-20	2	-0/+34
\|\ \ \ \| \|/ /
\| * \|	Do another contact lookup if the first one fails and...	Hung-ying Tyan	2010-10-21	2	-0/+34
* \| \|	am baced375: Merge "Silently reject a ringing call when another call is diali...	Hung-ying Tyan	2010-10-20	1	-2/+20
\|\ \ \ \| \|/ /
\| * \|	Silently reject a ringing call when another call is dialing/ringing.	Hung-ying Tyan	2010-10-21	1	-2/+20
* \| \|	am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread	Hung-ying Tyan	2010-10-20	1	-1/+0
\|\ \ \ \| \|/ /
\| * \|	Remove ringtone API from SipAudioCall.	Hung-ying Tyan	2010-10-20	1	-1/+0
* \| \|	am b595e094: Merge "Return display name in SipConnection.getCnapName()." into...	Hung-ying Tyan	2010-10-19	1	-0/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Return display name in SipConnection.getCnapName()." into gingerbread	Hung-ying Tyan	2010-10-19	1	-0/+13
\| \|\ \
\| \| * \|	Return display name in SipConnection.getCnapName().	Hung-ying Tyan	2010-10-20	1	-0/+13
* \| \| \|	am bdf1706a: Merge "Reduce logging." into gingerbread	Joe Onorato	2010-10-19	1	-24/+17
\|\ \ \ \ \| \|/ / /
\| * \| \|	Reduce logging.	Joe Onorato	2010-10-19	1	-24/+17
\| \|/ /
* \| \|	am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPS...	David Brown	2010-10-13	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)	David Brown	2010-10-13	1	-2/+2
* \| \|	am a3100314: Merge "Remove some PII." into gingerbread	Wink Saville	2010-10-12	3	-13/+27
\|\ \ \ \| \|/ /
\| * \|	Remove some PII.	Wink Saville	2010-10-12	3	-13/+27
* \| \|	am 844a6b3c: Turn off additional debug.	John Wang	2010-10-12	1	-4/+4
\|\ \ \ \| \|/ /
\| * \|	Turn off additional debug.	John Wang	2010-10-12	1	-4/+4
* \| \|	am f5201ab7: Keep original phone number in SipConnection.	Hung-ying Tyan	2010-10-11	2	-6/+17
\|\ \ \ \| \|/ /
\| * \|	Keep original phone number in SipConnection.	Hung-ying Tyan	2010-10-12	2	-6/+17
* \| \|	am 15f7ff3c: Merge "Fix compile errors in telephony tests"	Jean-Baptiste Queru	2010-10-11	2	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge "Fix compile errors in telephony tests"	Jean-Baptiste Queru	2010-10-11	2	-2/+2
\| \|\ \
\| \| * \|	Fix compile errors in telephony tests	Mark Piper	2010-08-06	2	-2/+2
* \| \| \|	am c8511af0: Merge "Add mock ril control commands and tests" into gingerbread	Xia Wang	2010-10-11	2	-9/+178
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge "Add mock ril control commands and tests" into gingerbread	Xia Wang	2010-10-11	2	-9/+178
\| \|\ \ \
\| \| * \| \|	Add mock ril control commands and tests	Xia Wang	2010-10-10	2	-9/+178
* \| \| \| \|	am 0e430ccc: Merge "Telephony: Fix radio state printing"	Jean-Baptiste Queru	2010-10-10	1	-16/+21
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge "Telephony: Fix radio state printing"	Jean-Baptiste Queru	2010-10-10	1	-16/+21
\| \|\ \ \ \
\| \| * \| \| \|	Telephony: Fix radio state printing	Alex Yakavenka	2010-09-28	1	-16/+21
\| * \| \| \| \|	Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"	Jean-Baptiste Queru	2010-10-10	1	-1/+0
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Telephony: Remove unused mRuimFileHandler reference from CDMAPhone	Alex Yakavenka	2010-09-28	1	-1/+0
\| \| \|/ / / /
* \| \| \| \| \|	am d07833f5: Don\'t manually create CallerInfo objects from SipPhone	David Brown	2010-10-10	2	-47/+11
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Don't manually create CallerInfo objects from SipPhone	David Brown	2010-10-10	2	-47/+11
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	am df512214: Merge "Fix startDtmf." into gingerbread	John Wang	2010-10-10	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix startDtmf.	John Wang	2010-10-10	1	-1/+1
* \| \| \| \|	am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"	Jean-Baptiste Queru	2010-10-08	1	-1/+2
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	NullPointerException at handleMessage(GSMPhone.java)	Babis Triantafyllou	2010-10-08	1	-1/+2