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

3068 Commits

Author SHA1 Message Date
Kenny Root
d130ba8b00 am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'affff329088e569158e0ee45ee0e580b3c285722':
  Track change to Conscrypt
 2014-11-03 18:58:09 +00:00
Kenny Root
affff32908 am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
  Track change to Conscrypt
 2014-11-03 18:50:21 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Narayan Kamath
d449a008a0 am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'cd4910ef606e1fa8c974c348174ee55a65541cb6':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:42:49 +00:00
Narayan Kamath
cd4910ef60 am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:38:02 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07:00
Narayan Kamath
f0c7066742 am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit '78b3f5ab70300548776e3b98ee6d8fb6b1f5318f':
  Revert "Remove unused apache related API."
 2014-10-29 19:42:13 +00:00
Elliott Hughes
99e08b70aa am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
* commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac':
  Remove unused apache related API.
 2014-10-29 19:38:05 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Narayan Kamath
99562bf065 am 7192f0d2: am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '7192f0d2acafb2599988d463a42a2dcfd80c25bc':
  Remove tests/SslLoad.
 2014-10-29 17:56:07 +00:00
Narayan Kamath
7192f0d2ac am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a':
  Remove tests/SslLoad.
 2014-10-29 17:47:15 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
Narayan Kamath
b27ea56312 am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '00fd36399fd8dd9566b582c24817d130982bc270':
  Remove tests/SslLoad.
 2014-10-29 05:47:26 +00:00
Narayan Kamath
e87d36f892 Merge "Revert "Remove unused apache related API."" 2014-10-27 16:55:42 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API." 
This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
 2014-10-27 16:55:14 +00:00
Narayan Kamath
9834af9ccf Merge "Remove unused apache related API." 2014-10-27 16:17:21 +00:00
Narayan Kamath
3f2714e18b Remove unused apache related API. 
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
 2014-10-24 14:27:07 +01:00
Narayan Kamath
3f2d1a460a Remove tests/SslLoad. 
Crufty code that hasn't been touched in the past five years.
The test seems generally useless and there are dozens of richer
tests and benchmarks in conscrypt and libcore.

Change-Id: Ifbec8d419fd37f3b6323c9c74f47d0b7c85c9d4b
 2014-10-24 14:16:41 +01:00
John Reck
7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas
 2014-10-21 23:34:46 +00:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
ztenghui
6189bdd883 am 6a7335ac: am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '6a7335acd862babb40435f678348e3e651d77c89':
  Support negative value in exponential data in the pathData.
 2014-10-10 22:08:02 +00:00
Sandeep Siddhartha
2d1cd5b20b am f9c45add: am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'f9c45addceed8d98f5a9a8a7486e91e4980b1fec':
  Add tests for model management [SDK Only]
 2014-10-10 22:06:43 +00:00
ztenghui
6a7335acd8 am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '3406be853d21af58d551adbde805706f43ef51e2':
  Support negative value in exponential data in the pathData.
 2014-10-10 20:12:06 +00:00
ztenghui
5237c0c3c9 Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 2014-10-10 19:59:23 +00:00
ztenghui
846d53c1d5 am 39af6ae0: am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit '39af6ae064399ad58023752732ed2d388e897736':
  Support dot separation as the svg path data did.
 2014-10-10 18:39:43 +00:00
ztenghui
897f6daeff Support negative value in exponential data in the pathData. 
Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
 2014-10-10 11:11:34 -07:00
Sandeep Siddhartha
f9c45addce am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82':
  Add tests for model management [SDK Only]
 2014-10-10 17:14:23 +00:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
 2014-10-10 16:57:03 +00:00
Sandeep Siddhartha
dbc9aa2c7c am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d':
  Add tests for model management [SDK Only]
 2014-10-10 00:30:18 +00:00
Sandeep Siddhartha
f49c37d0b9 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 17:57:53 +00:00
Sandeep Siddhartha
ed65c63bdc Merge "Add tests for model management [SDK Only]" into lmp-dev 2014-10-09 17:54:16 +00:00
ztenghui
e6411c76c4 Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 2014-10-09 16:34:40 +00:00
ztenghui
4cc3e2704a Support dot separation as the svg path data did. 
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
 2014-10-08 15:51:37 -07:00
Adam Lesinski
5959304e58 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:47:19 +00:00
Adam Lesinski
ee437a6915 am d6353c8c: am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'd6353c8c0ee7f4a16c129df90679e734f735b4c9':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:41:11 +00:00
Adam Lesinski
d6353c8c0e am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '5166be9007b65728e0c55e88ef4d25417a8157ce':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:34:50 +00:00
Adam Lesinski
18ab83e571 am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:03:24 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Sandeep Siddhartha
b585ac5b5e Add tests for model management [SDK Only] 
This doesn't change any functionality/APIs etc.
It allows us to launch the activity and manually test the enrollment
methods.

Bug: 17885286
Change-Id: I506d9bb98a592131c04a50c9d6224164ffe07183
 2014-10-07 11:24:51 -07:00
Dianne Hackborn
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00