Nicolas Boichat
c4df82d292
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426
...
am: ffe4cefe73
Change-Id: Ib17900cfd7e3371c6afb703c956dd9d4aa7e26f1
2016-10-17 22:04:33 +00:00
Nicolas Boichat
5696846426
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 21:50:57 +00:00
Nicolas Boichat
983fbfccec
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce
...
am: 171491fa35
2016-10-17 17:23:12 +00:00
Nicolas Boichat
171491fa35
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9
...
am: fac99e31ce
2016-10-17 17:10:49 +00:00
Nicolas Boichat
fac99e31ce
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94
...
am: 516b0616e9
2016-10-17 05:23:18 +00:00
Nicolas Boichat
516b0616e9
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 05:15:47 +00:00
Tina Zhou
6854180825
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 am: e7fd69c032
...
am: 6a52d04b89
2016-10-13 16:19:52 +00:00
peter_li
058a74f477
[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 am: dc396795cc
...
am: efa1aec0f5
2016-10-13 16:19:20 +00:00
Tina Zhou
6a52d04b89
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
...
am: e7fd69c032
2016-10-13 16:12:40 +00:00
peter_li
efa1aec0f5
[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
...
am: dc396795cc
2016-10-13 16:12:17 +00:00
Tina Zhou
1e57f971a4
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: 1ef49dfc5d
2016-10-13 16:04:17 +00:00
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
2016-10-13 16:04:11 +00:00
peter_li
24c9b794f6
[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: 9e20cad5eb
2016-10-13 16:03:54 +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
2016-10-13 16:03:47 +00:00
Tina Zhou
1ef49dfc5d
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
2016-10-13 15:57:25 +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
2016-10-13 15:57:12 +00:00
peter_li
9e20cad5eb
[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
2016-10-13 15:56:56 +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
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
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
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
3325c61fdd
BUG:31504066 Skip merge of d6eb16d into nyc-dev am: e86d0c3689 am: db15235313 am: 4714e3983e
...
am: e252b4984e
2016-10-07 22:21:58 +00:00
Stephen Li
e252b4984e
BUG:31504066 Skip merge of d6eb16d into nyc-dev am: e86d0c3689 am: db15235313
...
am: 4714e3983e
2016-10-07 22:13:26 +00:00
Stephen Li
4714e3983e
BUG:31504066 Skip merge of d6eb16d into nyc-dev am: e86d0c3689
...
am: db15235313
2016-10-07 22:08:54 +00:00
Stephen Li
c83ea00deb
BUG:31504066 Skip merge of d6eb16d into nyc-dev am: e86d0c3689
...
am: e6a6bec385
2016-10-07 22:04:57 +00:00
Stephen Li
db15235313
BUG:31504066 Skip merge of d6eb16d into nyc-dev
...
am: e86d0c3689
2016-10-07 22:04:54 +00:00
Stephen Li
e6a6bec385
BUG:31504066 Skip merge of d6eb16d into nyc-dev
...
am: e86d0c3689
2016-10-07 22:00: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
926802bcaa
Test to ensure a toast doesn't affect app standby am: 87c10012b4
...
am: a79fdc6a3e
2016-09-22 01:33:49 +00:00
Amith Yamasani
a79fdc6a3e
Test to ensure a toast doesn't affect app standby
...
am: 87c10012b4
2016-09-21 21:58:13 +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
Dan Willemsen
a09564210e
DO NOT MERGE ANYWHERE Actually fix cts in nyc-dev-plus-aosp
...
am: 4a0758045c
2016-09-20 06:37:27 +00:00
Dan Willemsen
4a0758045c
DO NOT MERGE ANYWHERE Actually fix cts in nyc-dev-plus-aosp
...
I did this manually first, but came up with a much better way that
produced a slightly better result (verified the diffs against the next
branch). Sequence of commands:
# Checkout the last good commit (right before the first bad merge)
git checkout aa76e8b6fc8515bfc65d4b75456b74c26ee32f1e^
# Reset the HEAD pointer to the last bad merge, but not the worktree
git reset 3c197891b50d9ac5e5016f55551b6dff82f62f33
# Update the index
git add -A
# Apply all the changes that mattered between the above to commits
git cherry-pick -n 29cb19b774b6e0cb73851feb6877da5e42bba78e
git cherry-pick -n 0e9d107fcfbd3421b7988a4252a9965896019aba
git cherry-pick -n f19496887beb974c3bc9df9a57f6214a696417b1
git cherry-pick -n 939e2b253b798386ce53954626fd8044ecb18db6
git cherry-pick -n 02f07b5d5994b8345ebc86546e5f66524ac04dac
# Commit the changes
git commit
# Rebase the diffs on top of the latest nyc-dev-plus-aosp, since some
# changes have been manually applied, there will be a few merge
# conflicts
git rebase goog/nyc-dev-plus-aosp
All the SHA-1s above were discovered using a combination of this command
to find the changes actually submitted into nyc-dev-plus-aosp itself:
git log --oneline --first-parent goog/nyc-dev-plus-aosp
and then to find the original commits (that weren't marked as DO NOT
MERGE ANYWHERE):
git log --oneline --no-merges --stat aa76e8b..goog/nyc-dev-plus-aosp
Change-Id: Iec12619678cb8d011d2c6df26a34ce26e042b854
2016-09-20 05:56:27 +00:00
Amith Yamasani
6a24e5df31
Tests for idle parole when charging am: 2855028c8e
...
am: 22fcfb341a
2016-09-20 02:23:18 +00:00
Amith Yamasani
22fcfb341a
Tests for idle parole when charging
...
am: 2855028c8e
2016-09-20 00:13:03 +00: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
65857a7d5c
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f -s ours am: 9f775619f8 am: 987c7c6bc9
...
am: aab46c8b04
2016-09-14 23:57:29 +00:00
Stephen Li
aab46c8b04
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f -s ours am: 9f775619f8
...
am: 987c7c6bc9
2016-09-14 23:33:03 +00:00
Stephen Li
987c7c6bc9
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f -s ours
...
am: 9f775619f8
2016-09-14 23:15:33 +00:00
Stephen Li
467949ba73
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f
...
am: 0d9ef269a9
2016-09-14 23:08:43 +00:00
Daniel Xie
49725c1b28
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours am: 3cccbf13bc am: cae16d2533
...
am: d9f19088b1
2016-09-14 23:07:54 +00:00
Stephen Li
9f775619f8
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"
...
am: 07f9388e4f
2016-09-14 22:59:44 +00:00
Daniel Xie
d9f19088b1
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours am: 3cccbf13bc
...
am: cae16d2533
2016-09-14 22:44:19 +00:00
Stephen Li
0d9ef269a9
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"
...
am: 07f9388e4f
2016-09-14 22:36:57 +00:00
Daniel Xie
cae16d2533
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a -s ours
...
am: 3cccbf13bc
2016-09-14 22:35:42 +00:00
Daniel Xie
3cccbf13bc
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev
...
am: 253fdc667a
2016-09-14 22:27:07 +00:00
Stephen Li
07f9388e4f
Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"
...
This reverts commit 253fdc667a
2016-09-14 22:25:06 +00:00
