drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,811 Commits 1 Branch 0 Tags
Commit Graph

6050 Commits

Author SHA1 Message Date
Adam Lesinski
6167950b7a am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev 
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
  Remove UsageEvents#resetToStart() as it doesn't work
 2014-10-09 16:46:14 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Adam Lesinski
59d208ddc1 Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev 2014-10-08 20:34:55 +00:00
Adam Lesinski
54e064bcea Remove UsageEvents#resetToStart() as it doesn't work 
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
 2014-10-08 12:33:16 -07:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Przemyslaw Szczepaniak
d95788bf85 am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'f0a7c7672f158bc85ce400c1f59ec7fd973855d2':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 09:17:53 +00:00
Przemyslaw Szczepaniak
759962ab6d Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 2014-09-26 08:11:23 +00:00
Ye Wen
7558bde120 resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev 
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
 2014-09-25 11:20:08 -07:00
Junda Liu
cb6b5f9bd1 am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '96c548791145ab33ceb0935f38323d3182d44419':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 17:46:39 +00:00
Ye Wen
864a8b667a Merge "Hide carrier app intents in Telephony (1/2)" into lmp-dev 2014-09-25 17:36:32 +00:00
Junda Liu
698b3b2981 Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 2014-09-25 17:36:11 +00:00
Junda Liu
bac6d61ab6 Hide CarrierPrivilege APIs in TelMgr. 
Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
 2014-09-25 10:25:10 -07:00
Ye Wen
6c88ddaef6 Hide carrier app intents in Telephony (1/2) 
b/17608135

Change-Id: Ib42d40cf8aac98f62c7237fa450463ff7c1a0f47
 2014-09-25 09:30:06 -07:00
Przemyslaw Szczepaniak
6ddd9c29b3 Fix ambiguous TTS#playSilence method. 
Due to recent fixes for TTS API review (b/17389935)
overloaded playSilence method became ambiguous when
the last argument is null. This change renames the new
method to playSilentUtterance solving the issue.

Also, since LMP API level is 21, I updated invalid
references to it as API level 20 inside speech.tts.

Bug: 17389935
Change-Id: I9f9fae988240d1cec45d44650e53ffc29803ccac
 2014-09-25 11:26:31 +01:00
Jeff Tinker
766dc23b88 am 3eeac344: Merge "Implement API review feedback." into lmp-dev 
* commit '3eeac344b1aedf116b2340f3028f2cbaf34945d1':
  Implement API review feedback.
 2014-09-23 17:43:07 +00:00
Jeff Tinker
f7efd5c6a8 Merge "Implement API review feedback." into lmp-dev 2014-09-23 17:39:31 +00:00
Tyler Gunn
157bd0e39d am fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev 
* commit 'fa5456e5455d215fa73a504d78a8f152d8cd1b05':
  @hide ConnectionService APIs.
 2014-09-23 17:25:07 +00:00
Tyler Gunn
711d876fd1 @hide ConnectionService APIs. 
Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
 2014-09-23 10:00:38 -07:00
Jeff Tinker
21069d1914 Implement API review feedback. 
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
 2014-09-23 01:35:41 +00:00
Przemyslaw Szczepaniak
8977eae6db am 299bb1fb: Fix issues with new TTS API 
* commit '299bb1fbc62ab8d6e1389cb2959e093e217f8c79':
  Fix issues with new TTS API
 2014-09-22 17:55:56 +00:00
Przemyslaw Szczepaniak
f9ba548f21 Fix issues with new TTS API 
Bug: 17389935
Change-Id: I59234b3222f59dc89be7e40f7d4706b1f8c610ce
 2014-09-22 17:39:16 +01:00
Adam Powell
45acf7286f am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 
* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
  Add colorEdgeEffect to themes, default it to colorPrimary
 2014-09-19 20:43:48 +00:00
Adam Powell
17f48457d2 Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev 2014-09-19 20:31:14 +00:00
Adam Powell
c6c744da75 Add colorEdgeEffect to themes, default it to colorPrimary 
Allow edgeeffect colors to be changed independently of the primary
color for the current theme.

Bug 16512225

Change-Id: Ibc13ad755f489fe1f6d16af0c61a1d12dd1a61f7
 2014-09-19 12:50:31 -07:00
Nancy Chen
a82dcedd30 am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev 
* commit '6f2712513c83a2f13bf6376182edabbf022da890':
  Add constructor for DisconnectCause that does not require a tone.
 2014-09-19 19:32:31 +00:00
Nancy Chen
f4cf77c5dc Add constructor for DisconnectCause that does not require a tone. 
In order to create a DisconnectCause with a label/description that does
not require specifying a tone.

Bug: 17486242
Change-Id: If82605ff20fc9f53ed41b49e12575424c6efc2b6
 2014-09-19 11:01:45 -07:00
Chris Craik
c8fc7270b9 am e99510a4: Merge "Hide other color filter mutability" into lmp-dev 
* commit 'e99510a44685e4aff983eca9e432f8edbdfbd8fd':
  Hide other color filter mutability
 2014-09-19 17:54:42 +00:00
Chris Craik
f559326b18 Hide other color filter mutability 
bug:17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
 2014-09-19 08:54:09 -07:00
Ye Wen
fc72b71b4b am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 
* commit '3b5939fc093043d4bfa4c1cfda80f4c5e9ab8548':
  Add new error result code for mms config loading failure (1/2)
 2014-09-18 20:00:28 +00:00
Ye Wen
9f5638ed23 Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 2014-09-18 19:53:25 +00:00
Nancy Chen
6810fb95a3 am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 
* commit '93c75e4567a727636d26e7e386a78a883e649e48':
  Replace get*PhoneAccounts* public API methods with new method (1/3)
 2014-09-18 18:54:37 +00:00
Ye Wen
d572e4504d Add new error result code for mms config loading failure (1/2) 
b/17556258

Change-Id: I589a7b77be215dc98fb9f2c9b1a04cac5ee53558
 2014-09-18 11:42:45 -07:00
Nancy Chen
513c892135 Replace get*PhoneAccounts* public API methods with new method (1/3) 
Hide getCallCapablePhoneAccounts and getPhoneAccountsSupportingScheme
because a third party app should not be able to see all phone accounts
registered. Replace instead with getPhoneAccountsForPackage(Context)
which will only return the phone accounts registered by a particular package.

Bug: 17510811
Change-Id: I8465ef4f13b62fe83f51835cfffe1656298041a8
 2014-09-17 18:34:13 -07:00
Shri Borde
c23d12c278 Unhide SUB_ID column from Mms, Carriers and PendingMessages 
Change-Id: Iaf651f96bdd52b71b268eb37ae66a285cbb8f140
 2014-09-17 15:14:35 -07:00
Yorke Lee
9c412fb140 am b23e025a: Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
* commit 'b23e025aab63b2318a5fb711433f51720e8c400b':
  Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference
 2014-09-17 04:25:58 +00:00
Yorke Lee
58bacc513c Add playDtmfTone, stopDtmfTone and setAudioState to RemoteConference 
Bug: 17512380
Change-Id: Ie26bef643bdec97f64247b5f8099f2676ae6c63e
 2014-09-16 20:44:09 -07:00
Yorke Lee
edac2c611b am 44b693a3: Merge "Add missing methods to Conference object" into lmp-dev 
* commit '44b693a3cdee9908223723e961a29fbfc0305163':
  Add missing methods to Conference object
 2014-09-17 03:41:10 +00:00
Nancy Chen
68e3e27a1e am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 
* commit '05a2c7ef905777fdbc1129146df6f389e2e6980a':
  Remove ability to enable/disable phoneaccounts (1/6)
 2014-09-17 03:41:02 +00:00
Yorke Lee
1c4eb10cc1 Merge "Add missing methods to Conference object" into lmp-dev 2014-09-17 03:29:12 +00:00
Nancy Chen
ebc69cd19e Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev 2014-09-17 03:23:04 +00:00
Andrew Lee
0686e30652 am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '258f835f705bfcead1769da703c4fdb78d71295a':
  Add new DisconnectCause class to telecomm.
 2014-09-16 21:51:43 +00:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm. 
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
 2014-09-16 12:07:41 -07:00
Nancy Chen
210ef039fb Remove ability to enable/disable phoneaccounts (1/6) 
Enabling/disabling of phone accounts was only used for SIP accounts and
is no longer necessary for the purpose it was put in.
- Remove all references to enabling/disabling phone accounts
+ Rename getEnabledPhoneAccounts -> getCallCapablePhoneAccounts

Bug: 17510811

Change-Id: Id805daae3cc698c75f5e747b6a6107ab0bd3afa0
 2014-09-16 10:52:48 -07:00
Yorke Lee
a0d3ca9746 Add missing methods to Conference object 
Add setAudioState, onPlayDtmf and onStopDtmf to the conference object.
This fixes DTMF tones for conference calls.

Bug: 17512380
Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
 2014-09-15 19:18:13 -07:00
Shri Borde
7ac5d6fccd Merge "Unhide android.provider.Telephony.Sms.SUB_ID" into lmp-sprout-dev 2014-09-15 23:14:49 +00:00
Jeff Sharkey
2d360218b4 am 1d98fbf2: Merge "Update API naming to follow style guide." into lmp-dev 
* commit '1d98fbf27258cbe98e9f7226cc6baedd83a80d3d':
  Update API naming to follow style guide.
 2014-09-15 22:01:59 +00:00
Ihab Awad
e11a3b798b am 336c84c3: Merge "Add system feature for ConnectionService API support (1/3)" into lmp-dev 
* commit '336c84c35722e221cb3ec5d99c3876a5e5015e2a':
  Add system feature for ConnectionService API support (1/3)
 2014-09-15 22:01:41 +00:00
Jeff Sharkey
49c0e7375b Merge "Update API naming to follow style guide." into lmp-dev 2014-09-15 21:51:18 +00:00