summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-devDianne Hackborn2014-10-171-1/+0
|\
| * SDK only: hide the old L API version constant.Dianne Hackborn2014-10-161-1/+0
* | am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-devAmith Yamasani2014-10-141-1/+0
|\ \ | |/
| * Hide DISALLOW_OUTGOING_BEAM APIAmith Yamasani2014-10-141-1/+0
* | am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" in...Adam Lesinski2014-10-091-1/+0
|\ \ | |/
| * Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-devAdam Lesinski2014-10-081-1/+0
| |\
| | * Remove UsageEvents#resetToStart() as it doesn't workAdam Lesinski2014-10-081-1/+0
* | | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-091-0/+1
|\ \ \ | |/ /
| * | Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-071-0/+1
| |/
* | am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS pe...Dianne Hackborn2014-10-061-1/+1
|\ \ | |/
| * Fix issue #17752399: Multiple apps broken by GET_TASKS permission changeDianne Hackborn2014-10-031-1/+1
* | am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-devPrzemyslaw Szczepaniak2014-09-261-1/+1
|\ \ | |/
| * Merge "Fix ambiguous TTS#playSilence method." into lmp-devPrzemyslaw Szczepaniak2014-09-261-1/+1
| |\
| | * Fix ambiguous TTS#playSilence method.Przemyslaw Szczepaniak2014-09-251-1/+1
* | | resolved conflicts for merge of 13ff7c17 to lmp-sprout-devYe Wen2014-09-251-10/+0
|\ \ \ | |/ /
| * | Merge "Hide carrier app intents in Telephony (1/2)" into lmp-devYe Wen2014-09-251-10/+0
| |\ \
| | * | Hide carrier app intents in Telephony (1/2)Ye Wen2014-09-251-10/+0
| | |/
* | | am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-devJunda Liu2014-09-251-8/+0
|\ \ \ | |/ /
| * | Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-devJunda Liu2014-09-251-8/+0
| |\ \ | | |/ | |/|
| | * Hide CarrierPrivilege APIs in TelMgr.Junda Liu2014-09-251-8/+0
* | | am 3eeac344: Merge "Implement API review feedback." into lmp-devJeff Tinker2014-09-231-1/+0
|\ \ \ | |/ /
| * | Merge "Implement API review feedback." into lmp-devJeff Tinker2014-09-231-1/+0
| |\ \
| | * | Implement API review feedback.Jeff Tinker2014-09-231-1/+0
| | |/
* | | am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-devTyler Gunn2014-09-231-312/+0
|\ \ \ | |/ /
| * | @hide ConnectionService APIs.Tyler Gunn2014-09-231-312/+0
| |/
* | am 299bb1fb: Fix issues with new TTS APIPrzemyslaw Szczepaniak2014-09-221-2/+3
|\ \ | |/
| * Fix issues with new TTS APIPrzemyslaw Szczepaniak2014-09-221-2/+3
* | am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary...Adam Powell2014-09-191-0/+1
|\ \ | |/
| * Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-devAdam Powell2014-09-191-0/+1
| |\
| | * Add colorEdgeEffect to themes, default it to colorPrimaryAdam Powell2014-09-191-0/+1
* | | am 6f271251: Merge "Add constructor for DisconnectCause that does not require...Nancy Chen2014-09-191-0/+1
|\ \ \ | |/ /
| * | Add constructor for DisconnectCause that does not require a tone.Nancy Chen2014-09-191-0/+1
| |/
* | am e99510a4: Merge "Hide other color filter mutability" into lmp-devChris Craik2014-09-191-9/+0
|\ \ | |/
| * Hide other color filter mutabilityChris Craik2014-09-191-9/+0
* | am 3b5939fc: Merge "Add new error result code for mms config loading failure ...Ye Wen2014-09-181-0/+1
|\ \ | |/
| * Merge "Add new error result code for mms config loading failure (1/2)" into l...Ye Wen2014-09-181-0/+1
| |\
| | * Add new error result code for mms config loading failure (1/2)Ye Wen2014-09-181-0/+1
* | | am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new me...Nancy Chen2014-09-181-3/+1
|\ \ \ | |/ /
| * | Replace get*PhoneAccounts* public API methods with new method (1/3)Nancy Chen2014-09-171-3/+1
| |/
* | Unhide SUB_ID column from Mms, Carriers and PendingMessagesShri Borde2014-09-171-0/+3
* | am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConfer...Yorke Lee2014-09-171-0/+3
|\ \ | |/
| * Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConferenceYorke Lee2014-09-161-0/+3
* | am 44b693a3: Merge "Add missing methods to Conference object" into lmp-devYorke Lee2014-09-171-0/+4
|\ \ | |/
| * Merge "Add missing methods to Conference object" into lmp-devYorke Lee2014-09-171-0/+4
| |\
| | * Add missing methods to Conference objectYorke Lee2014-09-151-0/+4
* | | am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" int...Nancy Chen2014-09-171-5/+2
|\ \ \ | |/ /
| * | Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-devNancy Chen2014-09-171-5/+2
| |\ \
| | * | Remove ability to enable/disable phoneaccounts (1/6)Nancy Chen2014-09-161-5/+2
| | |/
* | | am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-devAndrew Lee2014-09-161-64/+32
|\ \ \ | |/ /
| * | Add new DisconnectCause class to telecomm.Andrew Lee2014-09-161-64/+32