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

9306 Commits

Author SHA1 Message Date
Nancy Chen
f563e7ece6 Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev 2014-09-11 18:29:56 +00:00
Nancy Chen
354b2bd0fe Make changes to Connection in Telecomm API (1/4) 
* onPhoneAccountClicked removed
* onSetAudioState -> onAudioStateChanged
* onSetState -> onStateChanged

Bug: 17329632
Change-Id: Icbba67439317bf1d21f758d58da7c83c4373efa6
 2014-09-11 11:25:03 -07:00
Bernhard Bauer
26408ccd8e Add DevicePolicyManager PrivateKey mgmt 
Additional device policy API to install keypairs to the keychain
silently.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
 2014-09-11 19:17:00 +01:00
Matthew Williams
9bff6a03b3 am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '3812a38b496e011166ca9e23620965eaace03bdc':
  Add flag to JobParameters for job expired
 2014-09-11 17:39:30 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Lajos Molnar
5a52457fab am 7fca7f55: am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '7fca7f55f21cd34b94ace89167f6516228520bff':
  add android.util.SizeF.parseSizeF()
 2014-09-11 17:27:43 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 17:26:40 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
 2014-09-11 17:24:48 +00:00
Tyler Gunn
020f92749d am ba740d4f: Allowing enable/disable of phone accounts. (1/3) 
* commit 'ba740d4f288c050687544491041af76140803d66':
  Allowing enable/disable of phone accounts. (1/3)
 2014-09-11 17:21:07 +00:00
Nancy Chen
0adb9d1754 am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 
* commit '48bc7ea4953a04f6b308171243487fd31208ec11':
  API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
 2014-09-11 17:21:03 +00:00
Tyler Gunn
a1ed7d1094 Allowing enable/disable of phone accounts. (1/3) 
- added "hasCapabilities" method on PhoneAccount.
- added CAPABILITY_PLACE_EMERGENCY_CALLS.
- added isEnabled method builder constructor to initialize from an
existing PhoneAccount.

Bug: 17306514
Bug: 17408536

Change-Id: I57de508b4adcf207f3b29cab449bfc634db80153
 2014-09-11 17:13:51 +00:00
Nancy Chen
4823aecef3 Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 2014-09-11 17:06:28 +00:00
ztenghui
fabf882611 am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
  Bring back the fillAlpha and strokeAlpha.
 2014-09-11 16:43:05 +00:00
ztenghui
c96e392765 Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev 2014-09-11 16:32:37 +00:00
Lajos Molnar
b8f6ebf028 am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '3b22910c898f26e604f7823b65c0f4d02e396ffb':
  add android.util.SizeF.parseSizeF()
 2014-09-11 15:59:15 +00:00
Alan Viverette
cdd5221105 am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '8b5ef83e1ba6ae3584d041654726315e996fe2d5':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 15:58:27 +00:00
Jean-Michel Trivi
ce6ec6d256 am c60cf440: am 16c67b4d: am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 
* commit 'c60cf440d6ef03f18cbcec8987da8fb5aa230fad':
  Virtualizer: replace device type by virtualization mode
 2014-09-11 14:15:28 +00:00
Eric Laurent
62462e4c1b am 31b26c08: am 728f1ba3: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev 
* commit '31b26c08f22b8fae6012460fa234792fbfaee473':
  Hide AudioDevice class
 2014-09-11 14:15:22 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
Christoph Studer
cbbfdd93ce am 7e972136: am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '7e97213689ca26aad243f5a5009c39f616298619':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-11 14:12:41 +00:00
Adam Connors
de2f85e871 am 94705219: am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '94705219a13a9d8909c4502eac493d3ef9459403':
  Add feature flags for verified boot and securely remove users.
 2014-09-11 14:12:28 +00:00
Lajos Molnar
5b54c9fb2a Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 2014-09-11 00:55:06 +00:00
Matthew Williams
03a4da6e8e Add flag to JobParameters for job expired 
BUG: 17424511
Introduce an "isOverrideDeadlineExpired" which will allow clients
to know when they are being run due to an expiry.
Nb that we check deadline expiry by checking that the constraints on
the job are not satisfied at execution time. Really this is the same
thing, as a job will not be run without its constraints being met,
unless the job has expired.

Change-Id: I4b91e5b5eadccabd91296d5a5ca66b859dbfaf5c
 2014-09-10 17:32:18 -07:00
Alan Viverette
7ff0270e7d Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 2014-09-10 23:29:13 +00:00
ztenghui
2e17d2b232 Bring back the fillAlpha and strokeAlpha. 
At the same time, remove the group alpha since we did not follow the convention
that group's alpha should apply together, not separately to each elements.

b/17393626

Change-Id: Idfc071414213583924961dc8ea760d6fb317873c
 2014-09-10 16:26:48 -07:00
Alan Viverette
362f984df3 Make SearchView styles public, remove public Holo styles added in L 
We shouldn't adding styles for a deprecated theme. Also this cleans up
the removed public resources for easier deletion later.

BUG: 17455273
Change-Id: I2c5caf354aab91463702f25c38f0dd29c153ba44
 2014-09-10 16:05:35 -07:00
Tao Bai
a0df890b46 am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit '3350edacefea92e2dfb5ad07a7b719334db8f157':
  Revise createIntent and parseResult API.
 2014-09-10 21:51:50 +00:00
Tao Bai
bebc56209d Merge "Revise createIntent and parseResult API." into lmp-dev 2014-09-10 21:43:04 +00:00
Jean-Michel Trivi
15d22bb97e am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 
* commit '6fa0947a589d193b95097e7bb966cdb80eb49a53':
  Virtualizer: replace device type by virtualization mode
 2014-09-10 17:32:02 +00:00
Eric Laurent
6811b1cdb5 am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev 
* commit 'c5db63b67a64b8319ce35a4e83770db6a5367fbe':
  Hide AudioDevice class
 2014-09-10 17:31:51 +00:00
Jean-Michel Trivi
f35423bb4e Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 2014-09-10 17:29:20 +00:00
Eric Laurent
b94b5d33b2 Merge "Hide AudioDevice class" into lmp-dev 2014-09-10 17:28:56 +00:00
Esteban Talavera
964a03bcaa am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '55bffb5041e18f2cf6884841165c2bbaf9576b98':
  Update string value for provisioning action and extra
 2014-09-10 17:06:45 +00:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Christoph Studer
7c6c8bc488 am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '6e68dff3deb0ec350aa769b4936e52ea00262beb':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:22:06 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Adam Connors
fb324578aa am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:16:38 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Jessica Hummel
285890c52d am fa2d0222: am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit 'fa2d0222de3f4c627e52647793a037cdd8bd110a':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:41:21 +00:00
Jessica Hummel
4eea5f821e am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:16:00 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Zhijun He
01b4bc1054 am d7332411: am 490f790b: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit 'd73324116a59b5ad9fcfcc8721db613e7d76f4c1':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 07:23:09 +00:00
Lajos Molnar
39e977834d am f152b6e5: am 482a07d7: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit 'f152b6e557a785eeca19041001167b1dba34f08d':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 07:22:57 +00:00
Zhijun He
7c3f8affdc am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit '5ef21e48b80876178636f3c5936c81409843ff7a':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 06:58:12 +00:00
Lajos Molnar
a3f86cb0c7 am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit '4f2764717bab9175eb1a22bcd770ff52d5c955f5':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 06:58:04 +00:00
Wink Saville
c8496fef5a Update current.txt 
As getSmsManagerUsingSubId was renamed to getSmsManagerForSubscriber.

Bug: 17255752
Change-Id: I4c3999d194bd0972f1e274b02228489d6a850da9
 2014-09-09 23:57:48 -07:00
Wink Saville
d02ec8d965 Update current.txt for two renamed methods. 
getSmsManagerUsingSubId and getSubIfnoUsingSubId now have ForSubscriber
as their suffix instead of UsingSubId.

Change-Id: I1e36a4770463fd0d6a2656c3bcbbfc07bd747e01
 2014-09-09 22:43:39 -07:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Lajos Molnar
0f491d7513 add android.util.SizeF.parseSizeF() 
Bug: 17190665
Change-Id: Ic1b0087dfd40b86aaeb4687a1a3024c1ab54018f
 2014-09-09 21:16:03 -07:00