summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* am 190202f7: am dbbf4932: am d9a3f89a: Merge commit \'69555fc2\' into fix-mer...Amit Mahajan2014-10-071-0/+12
|\
| * am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3Amit Mahajan2014-10-071-0/+12
| |\
| | * Merge commit '69555fc2' into fix-merge-conflict3Amit Mahajan2014-10-061-0/+12
| | |\
| | | * Sms7BitEncodingTranslatorXia Ying2014-10-071-0/+12
* | | | am 3b73c5c3: am 53fbb02d: am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT t...Etan Cohen2014-10-021-1/+4
|\ \ \ \ | |/ / /
| * | | am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL...Etan Cohen2014-10-021-1/+4
| |\ \ \ | | |/ /
| | * | am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classif...Etan Cohen2014-10-021-1/+4
| | |\ \ | | | |/
| | | * Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.Etan Cohen2014-10-021-1/+4
* | | | am a541338a: am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults....Stuart Scott2014-09-301-1/+10
|\ \ \ \ | |/ / /
| * | | am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-devStuart Scott2014-09-291-1/+10
| |\ \ \ | | |/ /
| | * | Get the MCC/MNC using defaults.Stuart Scott2014-09-291-1/+10
* | | | am 20bb1511: am 1f228230: am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HO...New Author Steven Liu2014-09-273-0/+28
|\ \ \ \ | |/ / /
| * | | am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system appNew Author Steven Liu2014-09-273-0/+28
| |\ \ \ | | |/ /
| | * | am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system appNew Author Steven Liu2014-09-273-0/+28
| | |\ \ | | | |/
| | | * redirect RIL_UNSOL_OEM_HOOK_RAW to system appNew Author Steven Liu2014-09-273-0/+28
* | | | am 07719bb5: am 2b267872: Added mechanism to merge voice & baseline ServiceSt...Etan Cohen2014-09-271-0/+19
|\ \ \ \ | |/ / /
| * | | Added mechanism to merge voice & baseline ServiceState objects.Etan Cohen2014-09-271-0/+19
* | | | am feffe6cc: am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscripti...xinhe2014-09-261-1/+1
|\ \ \ \ | |/ / /
| * | | am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registrati...xinhe2014-09-261-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Support multiple SIM/Subscription on telephony registration" into lmp-...xinhe2014-09-261-1/+1
| | |\ \
| | | * | Support multiple SIM/Subscription on telephony registrationxinhe2014-09-251-1/+1
* | | | | am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr...Junda Liu2014-09-261-17/+6
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Hide CarrierPrivilege APIs in TelMgr."Junda Liu2014-09-251-17/+6
| |/ / /
* | | | am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivil...Junda Liu2014-09-261-6/+17
|\ \ \ \ | |/ / /
| * | | am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-devJunda Liu2014-09-251-6/+17
| |\ \ \ | | | |/ | | |/|
| | * | Hide CarrierPrivilege APIs in TelMgr.Junda Liu2014-09-251-6/+17
* | | | am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into...Wink Saville2014-09-231-0/+18
|\ \ \ \ | |/ / /
| * | | Add SM isUsableSubIdValueWink Saville2014-09-231-0/+18
| | |/ | |/|
* | | am cad7b8cd: am ec6b28c3: am e66681ff: am f1524b5d: Merge "Fix for empty RSSI...xinhe2014-09-231-4/+2
|\ \ \ | |/ /
| * | am f1524b5d: Merge "Fix for empty RSSI triangle after boot" into lmp-devxinhe2014-09-231-4/+2
| |\ \ | | |/
| | * Fix for empty RSSI triangle after bootxinhe2014-09-191-4/+2
* | | am 715683e4: am b1fdc4ba: am d3edb391: am 86f939e8: Merge "Include code when ...Sailesh Nepal2014-09-171-1/+1
|\ \ \ | |/ /
| * | am 86f939e8: Merge "Include code when converting unknown causes to string" in...Sailesh Nepal2014-09-171-1/+1
| |\ \ | | |/
| | * Include code when converting unknown causes to stringSailesh Nepal2014-09-171-1/+1
* | | am 8074424b: am df23ff67: am 14f6fff6: am 258f835f: Merge "Add new Disconnect...Andrew Lee2014-09-171-0/+1
|\ \ \ | |/ /
| * | am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-devAndrew Lee2014-09-161-0/+1
| |\ \ | | |/
| | * Add new DisconnectCause class to telecomm.Andrew Lee2014-09-161-0/+1
| * | resolved conflicts for merge of f3804c3c to lmp-sprout-devYorke Lee2014-09-141-1/+5
| |\ \ |/ / / | | _
| * Pipe TelephonyManager.getCallState through TelecommManagerYorke Lee2014-09-141-3/+7
* | resolved conflicts for merge of 66c16547 to lmp-sprout-devTyler Gunn2014-09-135-17/+14
|\ \ | |/
| * Renaming Telecomm to Telecom.Tyler Gunn2014-09-125-16/+13
* | am 59c04032: Merge "Send and download MMS via content provider instead of PDU...Cheuksan Wang2014-09-121-9/+22
|\ \ | |/
| * Merge "Send and download MMS via content provider instead of PDU bytes." into...Cheuksan Wang2014-09-121-9/+22
| |\
| | * Send and download MMS via content provider instead of PDU bytes.Cheuksan Wang2014-09-111-9/+22
* | | am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle ne...Anthony Lee2014-09-121-3/+10
|\ \ \ | |/ /
| * | isValidSlotId() and isValidPhoneId() updated to handle negatives.Anthony Lee2014-09-111-3/+10
| |/
* | am 4c8c7591: Merge "Update the comment in two APIs since we will persist the ...Derek Tan2014-09-112-21/+24
|\ \ | |/
| * Merge "Update the comment in two APIs since we will persist the settings." in...Derek Tan2014-09-112-21/+24
| |\
| | * Update the comment in two APIs since we will persist the settings.Derek Tan2014-09-082-21/+24
* | | Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.Wink Saville2014-09-091-1/+1