summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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
* | | 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 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]
| * \ 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 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
| * | | Merge "Load shared library dependencies for AppWidgets" into lmp-devAdam Lesinski2014-10-075-0/+79
| |\ \ \ | | |/ / | |/| |
| | * | Load shared library dependencies for AppWidgetsAdam Lesinski2014-10-075-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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
| * | | Fix issue #17752399: Multiple apps broken by GET_TASKS permission changeDianne Hackborn2014-10-031-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-3/+2
|\ \ \ | |/ / |/| / | |/ Change-Id: I97671e62de26919e391dbb2686511584c59ab990
| * Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is an API change: FloatMath is going to be deprecated and/or removed. Performance is not the goal of this change. That said... Math is faster than FloatMath with AOT compilation. While making the change, occurances of: {Float}Math.sqrt(x * x + y * y) and {Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2)) have been replaced with: {(float)} Math.hypot(x, y) Right now there is no runtime intrinsic for hypot so is not faster in all cases for AOT compilation: Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with AOT, but all other combinations of FloatMath, use of pow() etc. are slower than hypot(). hypot() has the advantage of being self documenting and could be optimized in future. None of the behavior differences around NaN and rounding appear to be important for the cases looked at: they all assume results and arguments are in range and usually the results are cast to float. Different implementations measured on hammerhead / L: AOT compiled: [FloatMath.hypot(x, y)] benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials [FloatMath.sqrt(x*x + y*y)] benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials [FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))] benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials [(float) Math.hypot(x, y)] benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials [(float) Math.sqrt(x*x + y*y)] benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials [(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))] benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials Interpreter: benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I06c91f682095e627cb547d60d936ef87941be692
| * We need to specify a target SDK < 21 to use graphics RS.Stephen Hines2014-08-222-1/+2
| | | | | | | | | | | | | | | | | | Bug: 16031597 This change also removes some unnecessary code from ScriptC construction. Change-Id: I6680109deb34de841dfade769d556f5060aee423 (cherry picked from commit 8277a692be3c89519e368159e7707c8d35b89475)
| * am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled ↵Steve Moyer2014-03-162-10/+12
| |\ | | | | | | | | | | | | | | | | | | activities in smoke test." * commit '05d855defe8610854592ddd7baf5644ac6d4da15': Don't attempt to launch disabled activities in smoke test.
| * \ am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo ↵John Spurlock2014-03-074-0/+411
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | mode." * commit '6691bfd6462e27af7075a3a46eccce943f0de9dd': Example controller app for system ui demo mode.
* | | | Throw error when no intent can be foundwsmlby2014-10-011-6/+2
| | | | | | | | | | | | | | | | | | | | bug: 17396762 Change-Id: I10502d5d1e2332d9e6820ee645234c125e937b7a
* | | | Merge "Allow null queues to be set in MediaSession" into lmp-devRoboErik2014-09-251-0/+12
|\ \ \ \
| * | | | Allow null queues to be set in MediaSessionRoboErik2014-09-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some test code for it to OneMedia. bug:17593962 Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
* | | | | Merge "Add one more test and update old tests" into lmp-devztenghui2014-09-244-17/+136
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add one more test and update old testsztenghui2014-09-234-17/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just updating the internal test app. No real functionality changed. b/17631551 Change-Id: Icc01e017ea4fbf97712214e6ac02691d29ea5e96
* | | | | Merge "Work on issue #17628623: Need to update default preferred activities ↵Dianne Hackborn2014-09-241-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | for YouTube" into lmp-dev
| * | | | | Work on issue #17628623: Need to update default preferred activities for YouTubeDianne Hackborn2014-09-231-0/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the warning logs when setting up preferred activities to help identify when there are issues and what they are. Also improve the algorithm a little to still apply permissions when resetting them and there are additional third party apps, as long as the additional app is something like another browser and the preferred activity being set is more specific (has a better match). And add an example of using manifest-based preferred activities in to ActivityTest -- and yes it DOES work! :p Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
* | | | | Fix animation on the some propertiesztenghui2014-09-232-1/+31
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The risk is low since most of them are just matching the naming to xml. And this update won't cause build breakage. b/17623982 Change-Id: I1eda0b8314ec7b94bc03976cdc365a7dc1039f4c
* | | | Add leanback support to AppCompatiblityTestwsmlby2014-09-183-5/+11
| | | | | | | | | | | | | | | | Change-Id: Ia9da14b8551c4ec5834a047f0792a5a213a3ac04
* | | | Merge "Add root alpha and animation to (Animated)VectorDrawable" into lmp-devztenghui2014-09-124-1/+33
|\ \ \ \
| * | | | Add root alpha and animation to (Animated)VectorDrawableztenghui2014-09-124-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/17393626 Change-Id: If6a28b072f7d4bcb2b57022d86ec784f4c0d78f1
* | | | | Merge "UsageStats should deal with changing time" into lmp-devAdam Lesinski2014-09-121-1/+4
|\ \ \ \ \
| * | | | | UsageStats should deal with changing timeAdam Lesinski2014-09-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the system time is changed, the UsageStats API will modify all existing entries to correspond with the new time change. If the time changed when the device was off, stats in the future will be deleted. Change-Id: Ica3e9917d4d1a180f97700e52ab390e3673e1e82
* | | | | | Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITYMichael Wright2014-09-121-4/+5
| |/ / / / |/| | | | | | | | | | | | | | | | | | | Bug: 17290118 Change-Id: Iae3866bf3f7ac24f756ec4c183e848a79d1f779b
* | | | | Merge "Add flag to JobParameters for job expired" into lmp-devMatthew Williams2014-09-111-3/+8
|\ \ \ \ \
| * | | | | Add flag to JobParameters for job expiredMatthew Williams2014-09-101-3/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Bring back the fillAlpha and strokeAlpha.ztenghui2014-09-102-3/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix AppCompatibility test for different process name of one package." ↵wsmlby2014-09-101-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | into lmp-dev
| * | | | Fix AppCompatibility test for different process name of one package.wsmlby2014-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic30e5ee81fe6ea82e88d2c5541dc9fa9eba71043
* | | | | Merge "Remove deprecated (and now unused) API method." into lmp-devCraig Mautner2014-09-091-1/+1
|\ \ \ \ \
| * | | | | Remove deprecated (and now unused) API method.Craig Mautner2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes ActivityOptions.makeLaunchTaskBehindAnimation(). Fixes bug 16958544. Change-Id: I2d58f4235994fe01d55b3309d0ec6f8449c5d5b8
* | | | | | Add new wallpaper features for insets and offsets.Dianne Hackborn2014-09-0812-0/+831
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #17394151: WallpaperService / Engines need to get notified of WindowInsets Issue #17394203 Wallpapers need a system API to be shifted in order to support burn in protection Adds a new API on WallpaperManager to set additional offsets to make wallpapers extend beyond the display size. Insets are now reported to wallpapers, to use as they may. This includes information about the above offsets, so they can place their content within the visible area. And to help with this, also expose the stable offsets APIs in WindowInsets which is also very useful information for the wallpaper. Another new API on WallpaperManager to set a raw offset to apply to the wallpaper window, forcing it to move on the screen regardless of what the wallpaper is drawing. Fix wallpapers when used with overscan enabled, so they still extend out across the entire screen. Conveniently, the above new window insets information is very useful for this case as well! And a new wallpaper test app for all this stuff. Change-Id: I287ee36581283dd34607609fcd3170d99d120d8e
* | | | | | Work on issue #17357238: Recents is often slow if not used in a whileDianne Hackborn2014-09-051-1/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new activity attribute, resumeWhilePausing, that allows an activity specifying it to immediately start running without waiting for the previous activity to pause. The recents activity is updated to use this. The implementation of this is ultimately fairly simple -- if we are in the path of resuming such an activity, and find that we first need to pause the existing activity, then within the activity manager we do the regular pause flow but act like it has immediately finished pausing right then so that we can immediately go on to the resume. To make this clean, we tell the activity when asking it to pause that it should not come back and tell us it is done, because we aren't in any way waiting for it. One potentially important change I needed to make here is the pause callback no longer provides the saved persistent state, because we now can't count on that callback happening. I don't think there was really any utility in this anyway -- all modern apps will have their save state flow happen as part of stopping, not pausing, so we'll only capture that saved state when the stop is reported back anyway. And since we do send the saved state back when stopping, it would always blow away whatever we had gotten at the pause. Finally, update the documentation for AppTask.startActivity(), and fix the implementation handling that to be cleaner -- we need to deal with inTask first before getting in to "oh noes add NEW_TASK if this isn't coming from a calling activity" flow. Change-Id: Ia1da0fac90d7bdbaafdda2e34850d795ce17a39f