summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user ...David Brown2010-10-151-2/+2
|\
| * am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPS...David Brown2010-10-131-2/+2
| |\
| | * Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)David Brown2010-10-131-2/+2
* | | am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbreadWink Saville2010-10-133-13/+27
|\ \ \ | |/ /
| * | am a3100314: Merge "Remove some PII." into gingerbreadWink Saville2010-10-123-13/+27
| |\ \ | | |/
| | * Remove some PII.Wink Saville2010-10-123-13/+27
* | | am 7a26ebdf: am 844a6b3c: Turn off additional debug.John Wang2010-10-131-4/+4
|\ \ \ | |/ /
| * | am 844a6b3c: Turn off additional debug.John Wang2010-10-121-4/+4
| |\ \ | | |/
| | * Turn off additional debug.John Wang2010-10-121-4/+4
* | | am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.Hung-ying Tyan2010-10-132-6/+17
|\ \ \ | |/ /
| * | am f5201ab7: Keep original phone number in SipConnection.Hung-ying Tyan2010-10-112-6/+17
| |\ \ | | |/
| | * Keep original phone number in SipConnection.Hung-ying Tyan2010-10-122-6/+17
| * | am 15f7ff3c: Merge "Fix compile errors in telephony tests"Jean-Baptiste Queru2010-10-112-2/+2
| |\ \
| | * \ Merge "Fix compile errors in telephony tests"Jean-Baptiste Queru2010-10-112-2/+2
| | |\ \
| | | * | Fix compile errors in telephony testsMark Piper2010-08-062-2/+2
* | | | | resolved conflicts for merge of d4e3bf4d to masterXia Wang2010-10-122-3/+192
|\ \ \ \ \ | |/ / / /
| * | | | am c8511af0: Merge "Add mock ril control commands and tests" into gingerbreadXia Wang2010-10-112-9/+178
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Add mock ril control commands and tests" into gingerbreadXia Wang2010-10-112-9/+178
| | |\ \ \
| | | * | | Add mock ril control commands and testsXia Wang2010-10-102-9/+178
* | | | | | am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-111-16/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0e430ccc: Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-101-16/+21
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-101-16/+21
| | |\ \ \ \
| | | * | | | Telephony: Fix radio state printingAlex Yakavenka2010-09-281-16/+21
| | * | | | | Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"Jean-Baptiste Queru2010-10-101-1/+0
| | |\ \ \ \ \
| | | * | | | | Telephony: Remove unused mRuimFileHandler reference from CDMAPhoneAlex Yakavenka2010-09-281-1/+0
| | | |/ / / /
* | | | | | | am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipP...David Brown2010-10-112-47/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d07833f5: Don\'t manually create CallerInfo objects from SipPhoneDavid Brown2010-10-102-47/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Don't manually create CallerInfo objects from SipPhoneDavid Brown2010-10-102-47/+11
| | | |_|/ / | | |/| | |
* | | | | | am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-111-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-101-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix startDtmf.John Wang2010-10-101-1/+1
* | | | | | am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPho...Jean-Baptiste Queru2010-10-101-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"Jean-Baptiste Queru2010-10-081-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | NullPointerException at handleMessage(GSMPhone.java)Babis Triantafyllou2010-10-081-1/+2
| * | | | | am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" i...Xia Wang2010-10-076-0/+486
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbreadXia Wang2010-10-076-0/+486
| | |\ \ \ \
| | | * | | | Port mock ril controller and tests to GB. DO NOT MERGEXia Wang2010-10-076-0/+486
* | | | | | | resolved conflicts for merge of 5df4b5a7 to masterJean-Baptiste Queru2010-10-101-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 08fb5851: Merge "Add flag to skip restoring network seletion." into ginger...John Wang2010-10-071-2/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add flag to skip restoring network seletion.John Wang2010-10-071-2/+8
* | | | | | | am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not ...Wink Saville2010-10-101-18/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType....Wink Saville2010-10-071-18/+18
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Changed handling of onQueryCompelete to not use mimeType.Wink Saville2010-10-071-18/+18
| | |/ / / /
* | | | | | am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing c...Hung-ying Tyan2010-10-082-17/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gin...Hung-ying Tyan2010-10-052-17/+34
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbreadHung-ying Tyan2010-10-052-17/+34
| | |\ \ \ \
| | | * | | | CallManager/SipPhone: fix reject a ringing callHung-ying Tyan2010-10-062-17/+34
| | * | | | | Merge changes Ic5551c94,I0207f7f7 into gingerbreadMike Lockwood2010-10-052-0/+7
| | |\ \ \ \ \
| | | * | | | | GPS: Add support for AGpsRilInterface.Miguel Torroja2010-10-052-0/+7
| | | |/ / / /
| * | | | | | am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbreadRobert Greenwalt2010-10-051-13/+15
| |\ \ \ \ \ \ | | |/ / / / /