summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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
* | | Added mechanism to merge voice & baseline ServiceState objects.Etan Cohen2014-09-271-0/+19
* | | 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
* | | | Revert "Hide CarrierPrivilege APIs in TelMgr."Junda Liu2014-09-251-17/+6
|/ / /
* | | 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
* | | Add SM isUsableSubIdValueWink Saville2014-09-231-0/+18
| |/ |/|
* | 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 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 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
* | | am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.Junda Liu2014-09-102-16/+17
|\ \ \ | |/ /
| * | Add ForSubscriber suffix to APIs w/ subId argument.Junda Liu2014-09-092-16/+17
* | | Unhide SubscriptionManager and SubInfoRecordWink Saville2014-09-092-16/+1
* | | am 5dac65ad: Change suffix UsingSubId to ForSubscriber.Wink Saville2014-09-097-92/+92
|\ \ \ | |/ /
| * | Change suffix UsingSubId to ForSubscriber.Wink Saville2014-09-097-92/+92
* | | am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-devWink Saville2014-09-091-0/+2
|\ \ \ | |/ /
| * | Merge "Change getCurrentPhoneType to SystemApi" into lmp-devWink Saville2014-09-091-0/+2
| |\ \
| | * | Change getCurrentPhoneType to SystemApiWink Saville2014-09-081-0/+2
| | |/
* | | am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-devAmit Mahajan2014-09-091-1/+2
|\ \ \ | |/ /
| * | Merge "Assisted dialing support of MO SMS" into lmp-devAmit Mahajan2014-09-081-1/+2
| |\ \
| | * | Assisted dialing support of MO SMSXia Ying2014-09-051-1/+2
* | | | am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to...Amit Mahajan2014-09-081-1/+1
|\ \ \ \ | |/ / /