Commit Graph

840 Commits

Author SHA1 Message Date
Tina Zhou
e7fd69c032 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837
am: 908de2e143

Change-Id: Ifcf1b2894ba80e4eedc346d2d118b8bd1d66375a
2016-10-13 16:04:11 +00:00
peter_li
dc396795cc [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472
am: 254dfe5017

Change-Id: I5955ae432dfe4fd5f751bcf79d307b556e38ac37
2016-10-13 16:03:47 +00:00
Tina Zhou
908de2e143 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5
am: 4c76844837

Change-Id: Id59f50335fc16f56101f6d35dfc976bf2bcd285a
2016-10-13 15:57:12 +00:00
peter_li
254dfe5017 [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d
am: ca83ca8472

Change-Id: Id254c85d140dd854e095e47c1465b73426053fc5
2016-10-13 15:56:52 +00:00
Tina Zhou
4c76844837 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev
am: e7c890f1e5

Change-Id: I5580f0fdbfae37f0949af40988e0a5585e8e4a7f
2016-10-13 15:49:18 +00:00
peter_li
ca83ca8472 [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case.
am: 2ecad8d87d

Change-Id: If9c72d61d403b37ecd398179d5d3b447d252d7dc
2016-10-13 15:49:16 +00:00
Tina Zhou
e7c890f1e5 Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case." into nougat-cts-dev 2016-10-13 15:39:50 +00:00
peter_li
2ecad8d87d [CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case.
Symptom: It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for “CtsHostsideNetworkTests” test case.
Root Cause: The test function “setBatterySaverMode” of “CtsHostsideNetworkTests” use command to set setting DB when trying to turn on battery saver. But while trying to turn off battery saver, it only use charger plug-in event. It should be more reasonable to turn off battery saver through similar DB setting as this function did at turning on.
Solution: To control battery saver function from setting DB.
Project:
Note:
Test done by RD:
Futher testing need Q team's support:

Bug: 31897608

Change-Id: Id70ba458e85f98393d7652bb4e79bd182172c60f
2016-10-13 07:36:53 +00:00
Stephen Li
4714e3983e BUG:31504066 Skip merge of d6eb16d into nyc-dev am: e86d0c3689
am: db15235313

Change-Id: I1720a108232f137106a21fc1445b80d3cb67ff14
2016-10-07 22:08:54 +00:00
Stephen Li
db15235313 BUG:31504066 Skip merge of d6eb16d into nyc-dev
am: e86d0c3689

Change-Id: If58f1af63e917cba56e55b26ea555695e08935b1
2016-10-07 22:04:54 +00:00
Stephen Li
e86d0c3689 BUG:31504066 Skip merge of d6eb16d into nyc-dev 2016-10-07 12:58:55 -07:00
Stephen Li
d6eb16d248 Merge changes from topic 'aosp_snafu_fix' into nougat-cts-dev
* changes:
  Improve robustness of MediaSyncTest
  Handle inconsistent values for PR_SET_TIMERSLACK_PID in android.os.cts.SeccompTest.
  Fix a memory corruption (NativeCodeTest testPipeReadV)
  Add option logcat-on-failure-size to CTS and GTS
  Require android.software.device_admin for certain CtsVerifier tests
  Make "done" phase of ScreenPinningTestActivity reentrant.
  MediaSyncTest: increase ramp up time due to initial latency in AudioTrack.
  DO NOT MERGE ANYWHERE: CameraITS: allow each scene to be ran independently
  CameraITS scene4 should be skipped if read_3a is not supported
  CameraITS scene5 should be skipped if read_3a is not supported
  BUG:31504066 Reset to 94b4be7 with history
2016-10-07 19:04:51 +00:00
Amith Yamasani
87c10012b4 Test to ensure a toast doesn't affect app standby
Put an app in standby, make it show a toast and ensure
that it doesn't come out of standby. This is to test
for a bug fix for the same behavior.

Bug: 31544592
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdle_toast
Change-Id: I796ecde8e346c308a27969d873e3ce384414fee3
2016-09-21 12:46:52 -07:00
Amith Yamasani
2855028c8e Tests for idle parole when charging
Make sure that when switching between idle, paroled
and battery saver, the network availability of the app
is correctly updated.

Bug: 31399882
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_whenCharging
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_whenCharging
Change-Id: I060a0d5f9c3297430b5b623b389c1afdf6abde87
2016-09-19 13:33:27 -07:00
Stephen Li
d08617c2c8 BUG:31504066 Reset to 94b4be7 with history 2016-09-15 12:56:02 -07:00
Stephen Li
987c7c6bc9 Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f -s ours
am: 9f775619f8

Change-Id: Id9eb8b95284a0da7480d974028d194ed0595735d
2016-09-14 23:15:33 +00:00
Stephen Li
9f775619f8 Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"
am: 07f9388e4f  -s ours

Change-Id: I974a69e7b44067a92c265f1076226850ffbff92b
2016-09-14 22:59:44 +00:00
Daniel Xie
cae16d2533 Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours
am: 3cccbf13bc

Change-Id: I2581fa08b2b9d9875ede207c1fef0dd510e9711f
2016-09-14 22:35:42 +00:00
Daniel Xie
3cccbf13bc Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev
am: 253fdc667a  -s ours

Change-Id: I209c9227b5b9147e4d042c2db915ba0cb6935175
2016-09-14 22:27:07 +00:00
Stephen Li
07f9388e4f Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"
This reverts commit 253fdc667a.

Change-Id: If8862e289eb6693650713ff819c8b05f65cdeda5
2016-09-14 22:25:06 +00:00
The Android Automerger
253fdc667a Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev
* commit '9be9d5865ba2584a251642359710c074061dee5e': (75 commits)
  CameraITS scene5 should be skipped if read_3a is not supported
  Added Bluetooth LE tests
  Add CTS tests for LocalSocket read/write timeouts
  Replace libziparchive-host with libziparchive
  Fix clang-tidy warnings in libjnitest.
  Fix clang-tidy warnings in librscpptest.
  Fix clang-tidy warnings in openglperf2.
  Fix clang-tidy warnings in audio_quality.
  Replaces pcre with pcre2
  Add Mockito to deps for Conscrypt tests and remove core-tests
  simpleperf_cts_test: link libevent.
  Add the new android kernel path to includes.
  FileSystemPermisionTest: Drop unused method
  Use mockito-target-minus-junit4.
  android.core.tests.libcore.package.tests: add mockito to the dependencies
  Fix misc-macro-parentheses warnings in cts.
  [RenderScript] Fix refocus test to accommodate different rounding behavior for half_sqrt().
  Remove data race from refocus test
  Remove one test from MediaCodecTest#testCreateInputSurfaceErrors.
  Return all errors, not only the first one.
  ...
2016-09-14 21:21:50 +00:00
Bill Yi
158bfbece5 Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a
am: 849aac5aab

Change-Id: Icf4e3f43f0ec8be45522ede339ef3688703532d6
2016-09-14 01:48:26 +00:00
Bill Yi
849aac5aab Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a
am: bf2d4c864a

Change-Id: Ie6f0aafa6a3a9bbbcdafb547a17c38c1e5d5672b
2016-09-14 01:33:25 +00:00
Bill Yi
bf2d4c864a Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc
am: ba68fcfa5a

Change-Id: Ib31a984e09d82c65f217a4e92fe80176b1fb80a5
2016-09-14 01:22:14 +00:00
Daniel Xie
9be9d5865b Merge "CameraITS scene5 should be skipped if read_3a is not supported" into nougat-cts-dev 2016-09-09 03:33:03 +00:00
TreeHugger Robot
cd198fbef3 Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev 2016-09-06 21:20:20 +00:00
Neil Fuller
a8574413ed Add CTS tests for LocalSocket read/write timeouts
The behavior was not previous covered and broke in N
due to commit c80af6d8. There is an associated fix
in frameworks/base.

Some refactoring of existing tests to reduce
duplication and tidy up sockets after tests.

Test: Ran the new CTS test (before and after related fix)
Bug: 31205169
(cherry picked from commit 52376fc1c8)

Change-Id: I9ee96a91abbdaaba64c2f6daf49c92d1b23352e2
2016-08-31 18:18:02 +01:00
Neil Fuller
83bddfd9ec Merge "Add CTS tests for LocalSocket read/write timeouts" 2016-08-31 16:28:17 +00:00
Neil Fuller
52376fc1c8 Add CTS tests for LocalSocket read/write timeouts
The behavior was not previous covered and broke in N
due to commit c80af6d8. There is an associated fix
in frameworks/base.

Some refactoring of existing tests to reduce
duplication and tidy up sockets after tests.

Test: Ran the new CTS test (before and after related fix)
Bug: 31205169
Change-Id: Ie94335bc535beefcc5301d5469de6b8211af0bab
2016-08-31 13:12:54 +01:00
Felipe Leme
b0fc0ec688 DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours am: 6f82325df0
am: 3b8a14323c

Change-Id: I2a2229d49b67f64e339ddfeefe293858df57f372
2016-08-25 21:15:41 +00:00
Felipe Leme
3b8a14323c DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours
am: 6f82325df0

Change-Id: I9c306e97dfe3fad6b710f5e5323be9bf775bc157
2016-08-25 21:00:48 +00:00
Felipe Leme
6f82325df0 DO NOT MERGE:Improve check for activity on top after launch.
am: 9d8c5ba97e  -s ours

Change-Id: I81b40448821fa478355d048e566e3432a5d3bef9
2016-08-25 20:51:22 +00:00
Felipe Leme
2882cd2a7a Added tests for network restrictions while the screen is off.
BUG: 30785671
Change-Id: I1b211e545ff234272ff6acadfda9ce97765695a9
(cherry picked from commit b80a93061aa7d0a19b47a7dbb82f0dc06e3afb7e)
2016-08-20 03:58:09 +00:00
Felipe Leme
b7ff856a2a Improve check for activity on top after launch.
am: a871a99ebc

Change-Id: Ia2ae617d0c181eaed536ac81c6086d632fee6b24
2016-08-16 00:34:18 +00:00
Felipe Leme
9d8c5ba97e DO NOT MERGE:Improve check for activity on top after launch.
BUG: 30875754
Fixes: 30868243

Change-Id: Iad3d6ce80fcf24281e98251799c23abc9b83b52d
Change-Id: I8b7624e35caef107743d6 1f312e220f8bc21b9b8
2016-08-15 23:31:58 +00:00
Felipe Leme
a871a99ebc Improve check for activity on top after launch.
BUG: 30875754
Fixes: 30868243

Change-Id: I8b7624e35caef107743d61f312e220f8bc21b9b8
2016-08-15 15:50:38 -07:00
Neil Fuller
6406334d84 Merge "Initialize MockWebServer in setUp() not construction time"
am: f1026cb99e

Change-Id: I9c114d40171d73c90dcc4e2ef75a2239d39e4e81
2016-08-09 16:12:27 +00:00
Neil Fuller
f1026cb99e Merge "Initialize MockWebServer in setUp() not construction time" 2016-08-09 16:06:23 +00:00
Felipe Leme
9c1322683f Improvements on retry mechanism on network tests:
- Retry on all cases (not only when expecting connected).
- Uses exponential back-off for timeout.

BUG: 27803922
Fixes: 30509643

Change-Id: I42454f43158598a72e30f290c27c5a02e80ea6d2
2016-08-01 17:23:29 -07:00
Neil Fuller
a87e5240cc Initialize MockWebServer in setUp() not construction time
Should be a no-op but makes test suite creation cheaper.

Bug: 29820565
Change-Id: Ieee5568a6f477d591436275be4d4e7e3d5dbd322
2016-06-28 18:25:28 +01:00
Felipe Leme
e928006e67 Cover more PendingIntent whitelist scenarios.
BUG: 29480440
Change-Id: I961b765f40135efc06fbb3e5a4a94e8e333453da
2016-06-28 09:07:53 -07:00
Chih-hung Hsieh
9197c89071 resolve merge conflicts of 079d417 to stage-aosp-master
am: 64b0e44329

Change-Id: Ia3b91ebb942b4ab413ef4c76a06880c62e8581f9
2016-06-27 21:36:48 +00:00
Chih-Hung Hsieh
64b0e44329 resolve merge conflicts of 079d417 to stage-aosp-master
Change-Id: Ib8b7ed43d6c8dc4a9b843e6d2a974af30bcba0a0
2016-06-24 12:17:53 -07:00
Phil Weaver
3eab917a25 Merge \"CTS: Only listen to wifi events when toggling wifi\" into nyc-dev
am: 79fad1a209

Change-Id: Ieadf318b07d99acd8a2b73748fdac806731169d4
2016-06-23 01:57:27 +00:00
Phil Weaver
79fad1a209 Merge "CTS: Only listen to wifi events when toggling wifi" into nyc-dev 2016-06-23 01:48:11 +00:00
Phil Weaver
0d7d1da503 CTS: Only listen to wifi events when toggling wifi
When counting all connectivity changed events, we were failing
on devices with sim cards because we were counting both wifi and
mobile connectivity changes the same. Since the test only
toggles wifi, changing the listener only to pay attention to wifi
changes.

Bug: 29346253
Change-Id: I1ed3b976bc21419218c780d4afc4a5e73f128496
2016-06-22 16:50:38 -07:00
Chih-Hung Hsieh
60bd0b56fb Fix misc-macro-parentheses warnings in cts.
Add parentheses around macro arguments used beside operators.
Use 'aoto' type to avoid clang-tidy warnings of missing parentheses
of 'TYPE *'.

Bug: 28705665
Change-Id: I5d2c3b2bdfb7775200f31a011758b9a35b14794d
2016-06-22 14:29:53 -07:00
Daniel Xie
949d019a45 Merge \\\\\\"Remove non-CTS packets assertion code\\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863 am: 995005d649
am: 86ba00d2a9

Change-Id: I5d1edb0f813aaf3aa6b4558e5ce21e6b60fa340d
2016-06-22 00:23:13 +00:00
Jun Tahara
86ba00d2a9 Merge \\\\\"Remove non-CTS packets assertion code\\\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae am: 5c4a3982a8 am: fd1fb4d863
am: 995005d649

Change-Id: I40f34d7a22b09a4ef5a4190f2a236b643062f306
2016-06-22 00:20:07 +00:00
Jun Tahara
fd1fb4d863 Merge \\\"Remove non-CTS packets assertion code\\\" into marshmallow-cts-dev am: 0ba763ab98 am: 6ce150c6ae
am: 5c4a3982a8

Change-Id: Idcd4a248c8f74e095ba4162d8a468dbd962c8163
2016-06-22 00:14:51 +00:00