Commit Graph

3921 Commits

Author SHA1 Message Date
Kweku Adams
bb3b657b74 Merge "Change network parole while charging tests." 2019-10-17 00:06:49 +00:00
Xin Li
67b8735f5c [automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 8da12ce4c8 am: 32b3b7aaca
am: 371e2a500a -s ours
am skip reason: subject contains skip directive

Change-Id: I9f35c262c755a5b10b1b7e80e8844ea09bf447c9
2019-10-15 10:48:27 -07:00
Xin Li
371e2a500a DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 8da12ce4c8
am: 32b3b7aaca

Change-Id: I510acaeed29d9436db25da7497b22cddc92782c9
2019-10-15 10:29:33 -07:00
Xin Li
32b3b7aaca DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am: 8da12ce4c8

Change-Id: I7226c0d98df63d089b2e27e1a2073d361e45180f
2019-10-15 10:10:17 -07:00
Xin Li
8da12ce4c8 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I3a745ac766327f5efd2f79a1daa6b4b8890b1a42
2019-10-14 22:53:02 +00:00
Kweku Adams
1881bc644f Change network parole while charging tests.
The periodic parole window is the 10 minute window that occurs every
24 hours to let RARE apps run. Now that we have the quota system in
place, there's no need to have the periodic parole window. Alarms and
jobs will still be allowed to run when charging. Network will continue
to be restricted for RARE apps even when charging. JobScheduler requests
an exception for RARE jobs in quota, so they will still be able to run.
With this change, idle apps should still not get network when charging
unless JobScheduler requests it, so we have to update the tests.

Bug: 136184981
Test: atest AppStandbyControllerTests
Test: atest CtsAlarmManagerTestCases
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Test: atest com.android.server.AlarmManagerServiceTest
Test: atest com.android.server.AppStateTrackerTest
Test: atest com.android.server.job.controllers.QuotaControllerTest
Change-Id: Icd7b6eff8777f9b53a10eca521b73988f58f2d84
2019-10-14 11:37:43 -07:00
Jeffrey Vander Stoep
31e0d78ed5 Merge "getConnectionOwnerUid: add test for b/141603906" am: e8a8d9a26f am: ab361a6fbd am: 90190f2e14
am: 5a8999451e

Change-Id: I94d01773e64292a7e8ce7612fb2bd0dac686b860
2019-10-08 03:45:26 -07:00
Jeffrey Vander Stoep
5a8999451e Merge "getConnectionOwnerUid: add test for b/141603906" am: e8a8d9a26f am: ab361a6fbd
am: 90190f2e14

Change-Id: If1d5335854f076ec3f5b64678c83c879f3429bce
2019-10-08 03:39:20 -07:00
Jeffrey Vander Stoep
90190f2e14 Merge "getConnectionOwnerUid: add test for b/141603906" am: e8a8d9a26f
am: ab361a6fbd

Change-Id: I6a3ed1539640c02dd7f8bff1f26235285b9ab8c3
2019-10-08 03:33:23 -07:00
Jeffrey Vander Stoep
ab361a6fbd Merge "getConnectionOwnerUid: add test for b/141603906"
am: e8a8d9a26f

Change-Id: Ifbd37612218efb8b664d22698c64f6fdadbfafb8
2019-10-08 03:27:58 -07:00
Jeff Vander Stoep
c9068f1b87 getConnectionOwnerUid: add test for b/141603906
Test: on Marlin and Blueline run
    cts-tradefed run cts -m CtsHostsideNetworkTests \
    -t com.android.cts.net.HostsideVpnTests#testB141603906
Bug: 141603906
Change-Id: I759bc2295b2060e4575d61718c551d201a6455be
2019-10-08 10:41:45 +02:00
Amit Mahajan
a261dcd8cd Use update constructor for AudioGroup.
Test: basic sanity
Bug: 140872785
Change-Id: Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04
2019-09-12 12:32:37 -07:00
Xin Li
4bf9658b2d [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b7fab0094c -s ours am: f920179eaa -s ours
am: 08b3a7ee0f -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I412f63b339a8b6cc0781fd18c07b0c90ecd035ff
2019-09-11 15:37:30 -07:00
Xin Li
08b3a7ee0f [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b7fab0094c -s ours
am: f920179eaa -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I948c2d499e46121dfce5a6ed1bad05a285ddce62
2019-09-11 14:47:15 -07:00
Xin Li
f920179eaa [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b7fab0094c -s ours
am skip reason: change_id I4d60d2ad06007842be6af1f2ab844917f18cc629 with SHA1 55329386a3 is in history

Change-Id: I7ca35263e49c8736ecb056d097b11c137e2cdcde
2019-09-11 13:54:09 -07:00
Xin Li
745adf27d0 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours am: cc92930e29 -s ours
am: cda94f4bf1 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Ib1b266faca91c0f220442c71da14df787c2faaf5
2019-09-08 19:05:40 -07:00
Xin Li
cda94f4bf1 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours
am: cc92930e29 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Ibbc4e0b751f0636a976b9f35d908fcec4ec328f9
2019-09-08 18:53:20 -07:00
Xin Li
cc92930e29 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours
am: 1c04d967aa -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: I3930fccbb3b38c91c3f23e4a8d5a9c9bf56d7464
2019-09-08 18:35:49 -07:00
Xin Li
b7fab0094c Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: If5168b08718d9eece2a9d2b07738c5438151a53b
Merged-In: I4d60d2ad06007842be6af1f2ab844917f18cc629
2019-09-08 13:14:43 -07:00
Xin Li
d72728a613 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours am: 525d2c8ccf -s ours
am: 02eb568b35 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Id85f1afc2f057075a1a25ea2172ff578fc2d00a7
2019-09-07 18:45:27 -07:00
Xin Li
02eb568b35 [automerger skipped] Mark stage branch as merged in qt-dev. am: 5775b852a7 -s ours am: 1c04d967aa -s ours
am: 525d2c8ccf -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: Idc75529282a8f621473d73f6c52a142f7cb01759
2019-09-07 18:37:30 -07:00
Xin Li
1c04d967aa [automerger skipped] Mark stage branch as merged in qt-dev.
am: 5775b852a7 -s ours
am skip reason: change_id Ibcbd7833bec952d69841abbea827affc202941b6 with SHA1 ca767c6852 is in history

Change-Id: If270b3f6f9e197d0987ba457ad280042ff50f9ab
2019-09-06 14:55:34 -07:00
Xin Li
5775b852a7 Mark stage branch as merged in qt-dev.
Bug: 139373164
Merged-In: Ibcbd7833bec952d69841abbea827affc202941b6
Change-Id: I9b94f32253ac60194120f1299e6ae213d063977c
2019-09-06 13:41:14 -07:00
Xin Li
22d49c0644 Prepare for Android 10 Test Suite R2. 2019-09-06 10:33:42 -07:00
Xin Li
1c6f6f068b [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours am: e89f62e446 am: d00be03300
am: 710c96d876 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib7666a893d873e7e68cd704ceaa5f145ff6ac901
2019-09-05 12:22:43 -07:00
Xin Li
710c96d876 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours am: e89f62e446
am: d00be03300

Change-Id: I327521e376846cd573726289469ce2a87b17a1b5
2019-09-05 12:05:50 -07:00
Xin Li
d00be03300 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 409c0dd705 -s ours
am: e89f62e446

Change-Id: I408d0d9bdb1c13599e8e6ef3c5d319bb7157c653
2019-09-05 11:46:49 -07:00
Xin Li
e89f62e446 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 409c0dd705 -s ours
am skip reason: subject contains skip directive

Change-Id: I85a7864b8decff98e61982550d187229ee5ee7e4
2019-09-05 11:22:49 -07:00
Xin Li
409c0dd705 Merge "DO NOT MERGE - Merge Android 10 into master" 2019-09-05 16:53:35 +00:00
Xin Li
ada8c2f0b5 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Ifd3b99660fd3d2bf4b00dad4d30a7bdbfa35f0fc
2019-09-04 13:32:52 -07:00
Remi NGUYEN VAN
6350fa63b1 Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours am: 1d25609428 -s ours
am: e8c6850fcf -s ours
am skip reason: change_id I070b16661bc72a5c5035b0b227821b680d7d71ba with SHA1 5ac5569516 is in history

Change-Id: Ia789c8a5677d8235c5637299ae9e1bf8b37f81d0
2019-08-28 21:41:19 -07:00
Remi NGUYEN VAN
6f4143e271 [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca am: 09f277d4d8 -s ours am: 446037544b -s ours
am: 0bf40755c3 -s ours
am skip reason: change_id I070b16661bc72a5c5035b0b227821b680d7d71ba with SHA1 5ac5569516 is in history

Change-Id: I82c992055b935e427ff7b00b1e642606d06b3235
2019-08-28 21:39:28 -07:00
Remi NGUYEN VAN
e8c6850fcf Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours
am: 1d25609428 -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: Ie3f82a51ce529387e025f7322d2f7c746f4ad12c
2019-08-28 20:58:54 -07:00
Remi NGUYEN VAN
0bf40755c3 [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca am: 09f277d4d8 -s ours
am: 446037544b -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I320a0a54a5220c69691fb6e5cec673b7b8769994
2019-08-28 20:56:39 -07:00
Android Build Merger (Role)
1d25609428 Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history" into qt-r1-dev-plus-aosp 2019-08-29 03:51:02 +00:00
Remi NGUYEN VAN
7db79fe5e6 [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours
am: 26e815023f -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I05aecfee12cd4395732ac8c8de8d6e465b897edc
2019-08-28 20:50:40 -07:00
Remi NGUYEN VAN
446037544b [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca
am: 09f277d4d8 -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I7dd987e4099be7b2ea8b64495bf011f4e6c09513
2019-08-28 20:50:38 -07:00
Chalard Jean
5a73ee55b8 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours am: 37c92ec10c -s ours am: df298b6c9f -s ours am: 911079a493 -s ours
am: e5875307f6 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I4ad3086704aa810b03ce2955f2c725001da8daca
2019-08-28 20:43:12 -07:00
markchien
c658752f0b Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours am: ddbd12377c -s ours am: dad9c8a980 -s ours am: 718f123cfc -s ours
am: 5af794bd45 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ib0b2c8c9136fd1e2d15ec96e8cf5b5cc3ad1390f
2019-08-28 20:41:19 -07:00
Remi NGUYEN VAN
26e815023f [automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev
am: fd409edeca -s ours
am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA1 9c97c58656 is in history

Change-Id: I8e124374d711efc51b752c14f8a0ee524d3fb53e
2019-08-28 20:38:57 -07:00
Remi NGUYEN VAN
09f277d4d8 Merge "Add test for WifiInfo#getFrequency()" into qt-dev
am: fd409edeca

Change-Id: Iae0f61f999c113546eb425e26db5d4d4c0c1a51c
2019-08-28 20:35:43 -07:00
TreeHugger Robot
fd409edeca Merge "Add test for WifiInfo#getFrequency()" into qt-dev 2019-08-29 03:17:58 +00:00
Chalard Jean
e5875307f6 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours am: 37c92ec10c -s ours am: df298b6c9f -s ours
am: 911079a493 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I085af9922f33751e647899dd669897dc07d750e1
2019-08-28 19:37:23 -07:00
markchien
5af794bd45 Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours am: ddbd12377c -s ours am: dad9c8a980 -s ours
am: 718f123cfc -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I627dde8b6b987ab571a0521a64b3960b473ea02d
2019-08-28 19:35:31 -07:00
markchien
e2718986d1 Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours am: f2e8130635 -s ours am: 7526bf0f92 -s ours
am: 781ab3fbdf -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ia4fef6d05a072b94d24e7151f39b68b4f8974d09
2019-08-28 19:06:08 -07:00
markchien
78697c3b3b Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours am: 07e500dd00 -s ours am: 10d149e4bc -s ours am: 0cb9eae765 -s ours
am: 9f4a5995a2 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ifb330f4bcfb612767c9e92a5b439522a8461d50b
2019-08-28 18:47:19 -07:00
Chalard Jean
911079a493 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am: 97c35de59a -s ours am: 37c92ec10c -s ours
am: df298b6c9f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I3371b4d2c3c5adf4e73fccf101b544759ce07639
2019-08-28 18:46:18 -07:00
markchien
718f123cfc Merge "Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 0cfcb1a472 -s ours am: ddbd12377c -s ours
am: dad9c8a980 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3eef4d82eb1426061122ec3dba410e38ae37c349
2019-08-28 18:44:19 -07:00
markchien
781ab3fbdf Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours am: f2e8130635 -s ours
am: 7526bf0f92 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ib29a4bbef7c5c4dde43abd0b7ebce12c8aea52a1
2019-08-28 18:09:19 -07:00
markchien
7526bf0f92 Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: ddce521efa -s ours am: 8fe93b6bda -s ours
am: f2e8130635 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ie2500561329bba3cab6b6bab5851d080b0170b97
2019-08-28 17:33:23 -07:00