3389 Commits

Author SHA1 Message Date
Mitchell Wills
079b2f342c Don't pull in external/junit through mockito
android-support-test provides a different version of junit

FIXED=30481239

Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26
(cherry picked from commit d3868cfc63cd814e43367586f5706f39ec1cd5a9)
2016-08-29 11:26:50 -07:00
Christopher Wiley
346cceec25 Create frameworks-base-testutils lib
This permits sharing of test components used in connectivity tests.
Rename the MockLooper to TestLooper, reflecting that it is not a
true mock, but a manually controlled Looper for use in tests.

Bug: 28848133
Test: Tests consuming this library pass.

Change-Id: I57e11f9544c7bffdb02739ab2a921512b1b11874
(cherry picked from commit 07630f6bd3dbc91e2622cedfd1a21822b5f1f4b5)
2016-08-26 13:22:32 -07:00
Yorke Lee
3d80871032 Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
2016-06-16 21:22:22 +00:00
Dan Willemsen
5f551b3fdc resolve merge conflicts of 20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
2016-06-16 09:54:28 -07:00
Yorke Lee
0e85247195 Limit global drags to apps targeting SDK 24 and above
Bug: 29127791

Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
2016-06-16 09:35:40 -07:00
Dan Willemsen
9b3bc98425 Remove unused link to libcutils
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.

Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
2016-06-15 21:14:28 -07:00
John Reck
769c456bc1 Merge "Change overdraw test to use windowbackground" into nyc-dev
am: 34979a3af6

* commit '34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
  Change overdraw test to use windowbackground

Change-Id: Ie116603fc53999dd4251d940b5d5ee783684ac8e
2016-05-26 23:17:16 +00:00
John Reck
2ccaf6a448 Change overdraw test to use windowbackground
Bug: 28786023

Fixes an issue where the first couple frames would
be extremely slow due to the simpleness of HWUI's
overdraw rejection optimization.

Change-Id: I1fe3d83f7e2e0eb3299124b00b9f877c2c3aebf9
2016-05-26 14:36:42 -07:00
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit aa6c3c3e252252b80c3900bd4c1ff27d37265c6d)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
2016-05-12 11:15:47 -07:00
Aurimas Liutikas
12a2170136 Merge "Switch the default text selection handles to Material style." into nyc-dev
am: 78e421dbce

* commit '78e421dbced3181d0f43a174683b3c34cbb88a70':
  Switch the default text selection handles to Material style.

Change-Id: I07212a44d71c060eae1ed0a9afde451cb2d83713
2016-05-12 00:56:14 +00:00
Aurimas Liutikas
63999da503 Switch the default text selection handles to Material style.
-Switch to material style handles.
-Delete old handles.
-Remove the unrelated use of old handle in a test.

Bug: 28723844
Change-Id: I268c2672df541e5a1cdcdeb6712289fe06c06d5f
2016-05-11 16:43:37 -07:00
Chris Craik
80cb9b35ae Merge "Add WebView scroll activity to UiBench" into nyc-dev
am: 597acb4d0b

* commit '597acb4d0b9bf06d4021dc7a7154675d64cebb7d':
  Add WebView scroll activity to UiBench

Change-Id: I1b075ec6fead8d77d3776d7ddcd5263625660c07
2016-05-10 23:35:04 +00:00
Chris Craik
597acb4d0b Merge "Add WebView scroll activity to UiBench" into nyc-dev 2016-05-10 23:31:22 +00:00
Guang Zhu
92d321f1db Merge "allow optionally skipping of initial launch" into nyc-dev
am: 2c7d670933

* commit '2c7d670933e0e0f7f6a83c4353519511faaf4a2f':
  allow optionally skipping of initial launch

Change-Id: I2597a935ddd856ab8dc6857cbb987d7ba5063455
2016-05-06 04:56:19 +00:00
Guang Zhu
8f4fd67e7c allow optionally skipping of initial launch
Current harness performs one round of app launch as a "warm up", and
does not include that into final app launch time calculation. This
change skips this process so that it can speed up local test run
investigation.

Change-Id: I0b1948b2247d9f7e442e799d537508fba6dfa508
2016-05-05 19:45:22 -07:00
John Reck
1fd9f81745 Merge "Support transform\'d GraphicBuffers" into nyc-dev
am: 6d42b5c6e3

* commit '6d42b5c6e399a10799d2bba3f7113dd198cbcae6':
  Support transform'd GraphicBuffers

Change-Id: I620f9ef9e1e2ce4df6471b37d1ec06b0fcdb2a88
2016-04-29 14:55:28 +00:00
John Reck
3f061f2d50 Merge "Video source test & bugfix" into nyc-dev
am: a1c06675dd

* commit 'a1c06675dd2a83ce445f27b46cddab80f8c743e6':
  Video source test & bugfix

Change-Id: I1fb6f399b64828dbff8ab6a01fef7d11b447d183
2016-04-29 14:55:25 +00:00
John Reck
6d42b5c6e3 Merge "Support transform'd GraphicBuffers" into nyc-dev 2016-04-29 14:49:21 +00:00
John Reck
a1c06675dd Merge "Video source test & bugfix" into nyc-dev 2016-04-29 14:49:13 +00:00
John Reck
2f69d6d4fd Support transform'd GraphicBuffers
Bug: 28428955
Change-Id: I23e2fc9b96a67c7cfda42d9d7319e478194a7fa7
2016-04-28 13:32:27 -07:00
John Reck
f3a51d652f Video source test & bugfix
Bug: 28428970

Test for video sources and fix a bug where
we should throw an IAE for surfaces that are invalid
at request time.

Change-Id: I891a2b1568f583300433c7aca6de36d2e2621c63
2016-04-28 10:11:36 -07:00
Hyunyoung Song
237790ec48 Merge "Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"" into nyc-dev
am: 137e30a

* commit '137e30ae7bcfd0a7e2e272affc25a7770c9b626b':
  Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"

Change-Id: I79daad6a6299f686f7f71492b75630556d4998ae
2016-04-28 17:08:14 +00:00
Hyunyoung Song
137e30ae7b Merge "Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"" into nyc-dev 2016-04-28 16:57:26 +00:00
Hyunyoung Song
8398e8261e Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"
This reverts commit fcef23e831df0153fab7a3462973f0906ce9b8d8.
Bug: 28028331
Change-Id: I0bbcf7024749d06b7d78574afbb9625e6de8b96d
2016-04-28 16:50:11 +00:00
John Reck
f97dca612e Merge "API tweaks to PixelCopy and make it public" into nyc-dev
am: 7f209d3

* commit '7f209d37f17d4df09475137c38b84a3338c84023':
  API tweaks to PixelCopy and make it public

Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1 Merge "API tweaks to PixelCopy and make it public" into nyc-dev 2016-04-27 14:36:53 +00:00
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
2016-04-26 15:41:43 -07:00
Chris Craik
942bd9dcfa Merge "Improve SurfaceView postion snapping" into nyc-dev
am: 987609f

* commit '987609f5a7bd8e18559334aa0260e6614520af13':
  Improve SurfaceView postion snapping

Change-Id: I402bb1b85f8ae987723e6f2398b4245dfb76ba37
2016-04-26 20:28:10 +00:00
Chris Craik
0e974e7425 Improve SurfaceView postion snapping
bug:27098060

Snap SurfaceView positions to safely align to pixel boundaries.

Also expands MovingSurfaceViewActivity to support a scaling option, and
show problems more clearly.

Change-Id: Ic8e9c1e2f80c2c653bf4428e373f14528ddbce81
2016-04-22 15:48:17 -07:00
Tobias Thierer
28532d0026 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
(cherry picked from commit 4bd017d6a5437f153b2b0a149a5dde0b85bf6907)

Change-Id: Icfa4708946e774f4a1bacf185c3fd11a7087017e
2016-04-22 13:36:53 +01:00
Tobias Thierer
4bd017d6a5 frameworks/base: Avoid Long object allocations in Long.valueOf()
Replace usages where the Long is immediately unboxed or thrown
away with Long.parseLong().
In TaskRecord.java, I also fixed up similar uses of
{Boolean,Integer}.valueOf()

Tested: built frameworks/base successfully.

Bug: 28289401
Change-Id: I1fad536853a68c7b0707cbf02989aca155064843
2016-04-21 16:23:56 +01:00
Chris Craik
e706ef6b9e Add WebView scroll activity to UiBench
bug:28095056

Change-Id: Id1379d5a30835ef7285e729a3632cfef233d73a3
2016-04-18 13:29:58 -07:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Amith Yamasani
0d723a2a4d Merge "Multi-window assist callback" into nyc-dev 2016-04-14 19:06:40 +00:00
Julia Reynolds
d28967f489 Phone call vibrate should obey user preference.
Bug: 27353237
Change-Id: I6b52e378c9e664600720025af30596be09aeb19d
2016-04-14 09:37:08 -04:00
Amith Yamasani
e8222e551f Multi-window assist callback
Introducing a new callback in VoiceInteractionSession to
provide assist data for additional activities in the
foreground in a multiwindow setup.

PIP, docked windows and free-form windows (top-most)
will be queried for assist data and passed through the
new API to the Voice Interaction service.

Bug: 27718385

Change-Id: Ib4427c304611b75c2078dcb54f1f7e47ae7d9cfa
2016-04-13 17:12:29 -07:00
Dianne Hackborn
5fa590b2c2 Merge "(Test only) A little more debug output for voice interaction test" into nyc-dev 2016-04-13 17:45:36 +00:00
Dianne Hackborn
331ebfa775 (Test only) A little more debug output for voice interaction test
Seeing the font size and stuff is useful.

Change-Id: I6fac69db97c0b81c09546be644d0784650b6f8ca
2016-04-12 18:09:56 -07:00
John Reck
d2eec0efb2 Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev 2016-04-12 14:36:11 +00:00
John Reck
10dd0585c1 Framework-side of SurfaceView#getBitmap
Bug: 27708453

Change-Id: Ie6fd7eca522d3e6549d8af587c975fd7e6053649
2016-04-11 16:00:22 -07:00
Chris Thornton
15ab2b45e7 Updates to sound trigger test app.
Now supports loading model information from .properties files inside the
app's data directory. This lets you prepare models for your actual
device, rather than just fake data. If no .properties files are present,
falls back to the default fake three models.

Also adds support for playing some trigger audio, so you can use the
same device to (hopefully) have a trigger be detected.

Change-Id: I003849eb11d4995534d4c070838810d4519991f8
2016-04-10 21:37:31 -07:00
Julia Reynolds
e46bb37acf Allow the ranker to autobundle notifications.
Bug: 26709317
Change-Id: I5017a471604e513a7b582cdc2f3472441e108fae
2016-04-08 13:55:03 -04:00
Ryan Bavetta
79700d215a Merge "Adds Soundtrigger Stub HAL Fuzz Test" into nyc-dev 2016-04-01 22:20:44 +00:00
Ryan Bavetta
a0319cb5c4 Adds Soundtrigger Stub HAL Fuzz Test
Change-Id: I7035a6332c93f2630b0114dc6930e66f89cc86cd
2016-04-01 15:18:02 -07:00
Gopinath Elanchezhian
48a4275bf6 Merge "Increase post launch idle timeout to 60 secs" into nyc-dev 2016-04-01 18:37:23 +00:00
Gopinath
5aa567a869 Increase post launch idle timeout to 60 secs
Bug 27944664

Change-Id: Ibc57923f1b49414b27b0738e005c278749c3f17a
2016-04-01 10:24:10 -07:00
Teng-Hui Zhu
9ac5a3333d Add test for private API forceAnimationOnUI
b/27343522

Change-Id: I5167a159f5630ab064f434930f3056754e2c0f44
2016-03-31 11:37:00 -07:00
Tenghui Zhu
0ade7ff3c0 Merge "Add radio button as a bundle XML file in the manual test" into nyc-dev 2016-03-30 20:38:15 +00:00
Glenn Kasten
0f5e32d8eb Merge "Fix CRLF" into nyc-dev 2016-03-30 19:41:05 +00:00