summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge "VD:test:Remove open animation AVD" into lmp-mr1-devztenghui2014-11-0622-551/+0
| | |\ \
| | | * | VD:test:Remove open animation AVDztenghui2014-11-0422-551/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for unbundle apps, so it is not a good idea to put in open source. b/18171696 Change-Id: I4272a9cd12904b90b4421e88304795a292ceec58
* | | | | am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill ↵Wale Ogunwale2014-11-041-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | process if it still has tasks. * commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4': Fix issue #17305377: Don't kill process if it still has tasks.
| * | | | am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it ↵Wale Ogunwale2014-11-041-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | still has tasks. * commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895': Fix issue #17305377: Don't kill process if it still has tasks.
| | * | | Fix issue #17305377: Don't kill process if it still has tasks.Wale Ogunwale2014-11-041-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously killed a process when one of its task was swiped away in the recents UI. This had negative performance implications for apps with multiple tasks in recents. Now we will only kill the process if there are no more tasks associated with it. Changed also removes the need for the ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager will now only kill a task process if it process has no out standing tasks. Bug: 17305377 Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
* | | | am affff329: am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'affff329088e569158e0ee45ee0e580b3c285722': Track change to Conscrypt
| * | | am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'd00ced983ee235f72a9261fd967309a2638dde05': Track change to Conscrypt
| | * | am b0cb0734: Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1': Track change to Conscrypt
| | | * \ Merge "Track change to Conscrypt"Kenny Root2014-11-031-2/+2
| | | |\ \
| | | | * | Track change to ConscryptKenny Root2014-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change way in which an outside caller can get the preferred SSLContext. Bug: 17136008 Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
* | | | | | am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused ↵Narayan Kamath2014-11-031-93/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apache related API.""" * commit 'cd4910ef606e1fa8c974c348174ee55a65541cb6': Revert "Revert "Remove unused apache related API.""
| * | | | | am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache ↵Narayan Kamath2014-11-031-93/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related API.""" * commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3': Revert "Revert "Remove unused apache related API.""
| | * | | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-93/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735': Revert "Revert "Remove unused apache related API.""
| | | * | | Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-93/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-031-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea. Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
* | | | | | am 78b3f5ab: am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache ↵Narayan Kamath2014-10-291-0/+93
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related API."" * commit '78b3f5ab70300548776e3b98ee6d8fb6b1f5318f': Revert "Remove unused apache related API."
| * | | | | am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+93
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f': Revert "Remove unused apache related API."
| | * | | | am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+93
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e87d36f8925a34f85ba80c886757d07ad03fed42': Revert "Remove unused apache related API."
| | | * | | Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-271-0/+93
| | | |\ \ \ | | | | |/ /
| | | | * | Revert "Remove unused apache related API."Narayan Kamath2014-10-271-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14. Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
* | | | | | am b5ce284a: resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aospElliott Hughes2014-10-291-93/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b5ce284aa8e738de051572ab37a01d52fa7b1dac': Remove unused apache related API.
| * | | | | resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aospElliott Hughes2014-10-291-93/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
| | * | | | resolved conflicts for merge of 9834af9c to stage-aosp-masterNarayan Kamath2014-10-291-93/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
| | | * | | Merge "Remove unused apache related API."Narayan Kamath2014-10-271-93/+0
| | | |\ \ \ | | | | |/ /
| | | | * | Remove unused apache related API.Narayan Kamath2014-10-241-93/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hidden and used only in unit tests. Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
* | | | | | am 7192f0d2: am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad."Narayan Kamath2014-10-293-146/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '7192f0d2acafb2599988d463a42a2dcfd80c25bc': Remove tests/SslLoad.
| * | | | | am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad."Narayan Kamath2014-10-293-146/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a': Remove tests/SslLoad.
| | * | | | am 00fd3639: Merge "Remove tests/SslLoad."Narayan Kamath2014-10-293-146/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '00fd36399fd8dd9566b582c24817d130982bc270': Remove tests/SslLoad.
| | | * | | Remove tests/SslLoad.Narayan Kamath2014-10-243-146/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-devSandeep Siddhartha2014-10-095-4/+369
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135': Add tests for model management [SDK Only]
| | * \ \ \ am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into ↵Adam Lesinski2014-10-075-0/+79
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc': Load shared library dependencies for AppWidgets
| | * \ \ \ \ am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS ↵Dianne Hackborn2014-10-061-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission change" into lmp-dev * commit '7f7d240b13b96b617e298c6178af0425308f5ef9': Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
| | * \ \ \ \ \ resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-3/+2
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
* | | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-213-0/+266
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 76f24bd * commit '76f24bde7816dd97ed2375ec41c9817be0330d9f': Surface:lockHardwareCanvas
| * | | | | | | am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-devJohn Reck2014-10-213-0/+266
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'e73a54f33c029552469fcf1cda46eed2f360a38e': Surface:lockHardwareCanvas
| | * | | | | | Surface:lockHardwareCanvasJohn Reck2014-10-213-0/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17440886 Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
* | | | | | | | am 6a7335ac: am 3406be85: am 5237c0c3: Merge "Support negative value in ↵ztenghui2014-10-1022-0/+551
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exponential data in the pathData." into lmp-mr1-dev * commit '6a7335acd862babb40435f678348e3e651d77c89': Support negative value in exponential data in the pathData.
| * | | | | | | am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data ↵ztenghui2014-10-1022-0/+551
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the pathData." into lmp-mr1-dev * commit '3406be853d21af58d551adbde805706f43ef51e2': Support negative value in exponential data in the pathData.
| | * | | | | | Merge "Support negative value in exponential data in the pathData." into ↵ztenghui2014-10-1022-0/+551
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | | | | Support negative value in exponential data in the pathData.ztenghui2014-10-1022-0/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am f9c45add: am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add ↵Sandeep Siddhartha2014-10-105-4/+369
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests for model management [SDK Only]" into lmp-dev * commit 'f9c45addceed8d98f5a9a8a7486e91e4980b1fec': Add tests for model management [SDK Only]
| * | | | | | | | am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for ↵Sandeep Siddhartha2014-10-105-4/+369
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | model management [SDK Only]" into lmp-dev * commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82': Add tests for model management [SDK Only]
| | * | | | | | | am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" ↵Sandeep Siddhartha2014-10-105-4/+369
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d': Add tests for model management [SDK Only]
| | | * | | | | | Merge "Add tests for model management [SDK Only]" into lmp-devSandeep Siddhartha2014-10-095-4/+369
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | Add tests for model management [SDK Only]Sandeep Siddhartha2014-10-075-4/+369
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 39af6ae0: am a92dd37f: am e6411c76: Merge "Support dot separation as the ↵ztenghui2014-10-103-1/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svg path data did." into lmp-mr1-dev * commit '39af6ae064399ad58023752732ed2d388e897736': Support dot separation as the svg path data did.
| * | | | | | | am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data ↵ztenghui2014-10-103-1/+30
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | did." into lmp-mr1-dev * commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da': Support dot separation as the svg path data did.
| | * | | | | | Merge "Support dot separation as the svg path data did." into lmp-mr1-devztenghui2014-10-093-1/+30
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Support dot separation as the svg path data did.ztenghui2014-10-083-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am d6353c8c: am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load ↵Adam Lesinski2014-10-075-0/+79
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shared library dependencies for AppWidgets" into lmp-dev * commit 'd6353c8c0ee7f4a16c129df90679e734f735b4c9': Load shared library dependencies for AppWidgets