Commit Graph

3962 Commits

Author SHA1 Message Date
Patrik Fimml
0b70bb209d Merge "Configurable SoftAP: Add CTS test." 2019-11-08 17:39:36 +00:00
Steven Liu
d4cd31d635 Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi" am: dc714602ca am: d71b50bd7d
am: 19dd4bcce8

Change-Id: Ib4ff9d666476bde1bc1d8e673abd4d23e5922484
2019-11-08 09:37:30 -08:00
Steven Liu
19dd4bcce8 Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi" am: dc714602ca
am: d71b50bd7d

Change-Id: I67fb9a1f02ad24a9cc9b553418d42ba29e1dc28a
2019-11-08 09:31:25 -08:00
Steven Liu
d71b50bd7d Merge "Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi"
am: dc714602ca

Change-Id: I1bba2575132f587f03251a21913d34c6428f9d82
2019-11-08 09:27:05 -08:00
Patrik Fimml
461242c670 Configurable SoftAP: Add CTS test.
This uses a recently-introduced mechanism that allows testing System
APIs from CTS.

Bug: 132705022
Test: atest android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotWithConfig
Change-Id: Ifeb502600122919f205dfd66b6b62c18f2920309
2019-11-08 16:37:10 +01:00
Steven Liu
4998a0203f Allow 2 apps with NETWORK_CARRIER_PROVISION permission for wifi
Bug: 143917577
Test: build
Change-Id: I25291651487e74d6d0bb36b47215d64e9a3b978c
2019-11-07 22:18:50 +00:00
Amit Mahajan
7e78a94d9a [automerger skipped] Merge "Use update constructor for AudioGroup." am: 39ae795f38 am: 2af1095c3e
am: b0e884feb2 -s ours
am skip reason: change_id Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04 with SHA1 a261dcd8cd is in history

Change-Id: If6e377dd0592e2795b12929417899770bc07eae8
2019-11-01 17:28:45 -07:00
Amit Mahajan
b0e884feb2 Merge "Use update constructor for AudioGroup." am: 39ae795f38
am: 2af1095c3e

Change-Id: I425e2548c52449e53eb092d0c2e62cbffb119130
2019-11-01 17:18:29 -07:00
Amit Mahajan
2af1095c3e Merge "Use update constructor for AudioGroup."
am: 39ae795f38

Change-Id: Iad6be4c066adcec9ccfedc2a21ff199162c4a677
2019-11-01 17:11:24 -07:00
Amit Mahajan
fca8772db7 Use update constructor for AudioGroup.
Test: basic sanity
Bug: 140872785
Merged-in: Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04
Change-Id: Ie5bdca10cd80b4b7d0241f9b1b4afdebca8aeb04
(cherry picked from commit a261dcd8cd)
2019-11-01 20:07:29 +00:00
Xin Li
3b20a31547 [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3238bb8068
am: 9c066c33d8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice0050719160f9a644166050f76594d8a2820a08
2019-10-31 14:01:28 -07:00
Xin Li
9c066c33d8 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 3238bb8068

Change-Id: I9841900fd587d6ae42bef00788ca346c6143c296
2019-10-31 13:14:06 -07:00
Xin Li
3238bb8068 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I36c36cd88cb36648a3343aeb191d497eba170c9a
2019-10-30 14:28:46 -07:00
Xin Li
e3128510bf [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours am: 7b9d907b2b -s ours
am: f8bea674e2 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I32f60c372ea327c62a4c35111ce91086c9a1fb3c
2019-10-26 23:55:18 -07:00
Xin Li
f8bea674e2 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours
am: 7b9d907b2b -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I3fcfaa9ab9b8ef8de8700aa79422e31cf11552f6
2019-10-26 23:35:28 -07:00
Xin Li
7b9d907b2b [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours
am: d8368c7ee9 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I7ba1d900e08829350cd929a2130c8c9ece24baf2
2019-10-26 23:11:20 -07:00
Xin Li
d8368c7ee9 [automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: 7512fc4407 -s ours
am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history

Change-Id: I3340ce47ce908daab8496b6dd60a189602549703
2019-10-26 22:48:21 -07:00
Xin Li
39ec8275f0 Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: Iaba32e3e94ccfbeb953807b364ab7a6264aa709a
Merged-In: Ia414339f44c010134faf02d87bcbfba140165398
2019-10-25 10:27:45 -07:00
Bookatz
5175525e62 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d am: 421f3f4eb1 am: 09ad73a386
am: 3b27402548

Change-Id: I7957ca4e5625ad4cdb9311276e27d9ae963cfcc4
2019-10-25 02:10:09 -07:00
Bookatz
ffee0a5805 Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4 am: 07e89e4601 am: bc64102b1f
am: 14696298f5

Change-Id: I796bfe6d2b4b7bf77df9af8a38fb9882b7170686
2019-10-25 02:09:29 -07:00
Bookatz
3770a80626 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72 am: d277b9c3c4 am: 62c2bd3167
am: 304ff02950

Change-Id: If4956c159175748cbaffad51d4e531ceda90f2a7
2019-10-25 02:09:21 -07:00
Bookatz
3b27402548 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d am: 421f3f4eb1
am: 09ad73a386

Change-Id: I0088b266318049c346e76d753eb60cb30344a4be
2019-10-25 01:57:26 -07:00
Bookatz
14696298f5 Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4 am: 07e89e4601
am: bc64102b1f

Change-Id: Id25d1a1057dd1313e61bb3909de032d61527f85a
2019-10-25 01:56:53 -07:00
Bookatz
304ff02950 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72 am: d277b9c3c4
am: 62c2bd3167

Change-Id: Ic8b22a57e99f78572299e4d3907e3355d8d8581b
2019-10-25 01:56:46 -07:00
Bookatz
09ad73a386 Merge "CTS secondary_user: CtsNativeNetTestCases" am: eae810977d
am: 421f3f4eb1

Change-Id: I07e29985cee9dbcecb4e88d89adc8bf326070817
2019-10-25 01:47:02 -07:00
Bookatz
bc64102b1f Merge "CTS secondary_user: CtsNetApi23TestCases" am: 32dbf1f7e4
am: 07e89e4601

Change-Id: I3d604eb604130f41a4a0ce5b6c63de75b679d589
2019-10-25 01:46:26 -07:00
Bookatz
62c2bd3167 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" am: dcc0677c72
am: d277b9c3c4

Change-Id: I7486ea42408b12cd244c84f89d416804515b5cb5
2019-10-25 01:46:18 -07:00
Bookatz
421f3f4eb1 Merge "CTS secondary_user: CtsNativeNetTestCases"
am: eae810977d

Change-Id: Iae22a28251b1d7cbcd6eb49567f1a3350b249cbc
2019-10-25 01:34:37 -07:00
Bookatz
07e89e4601 Merge "CTS secondary_user: CtsNetApi23TestCases"
am: 32dbf1f7e4

Change-Id: I546f02bd4cdf2419805704d9272771a4161011ea
2019-10-25 01:34:06 -07:00
Bookatz
d277b9c3c4 Merge "CTS secondary_user: CtsNativeNetDnsTestCases"
am: dcc0677c72

Change-Id: I45d6ee5cbf37c7556a48fe7aae841e496ae0c3a0
2019-10-25 01:34:00 -07:00
Treehugger Robot
eae810977d Merge "CTS secondary_user: CtsNativeNetTestCases" 2019-10-25 08:16:47 +00:00
Treehugger Robot
32dbf1f7e4 Merge "CTS secondary_user: CtsNetApi23TestCases" 2019-10-25 08:16:47 +00:00
Treehugger Robot
dcc0677c72 Merge "CTS secondary_user: CtsNativeNetDnsTestCases" 2019-10-25 08:16:47 +00:00
Bookatz
306cf25378 CTS secondary_user: CtsNetApi23TestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I306953dbe90f1c4772c3bc26d6f73279c1ac525a
2019-10-24 09:59:43 -07:00
Bookatz
42919c7b96 CTS secondary_user: CtsNativeNetDnsTestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I8d9a9b56d5f392548032c5e50730d6c5528f8f91
2019-10-24 09:59:09 -07:00
Bookatz
ba585050d9 CTS secondary_user: CtsNativeNetTestCases
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I1d904c733ed6bc52b8fe3909c34b0ad186b7fd43
2019-10-24 09:58:43 -07:00
Junyu Lai
6ca6b22416 Merge "Set keepalive socket timeout to default value" am: 4c8baa10f9 am: 8d03ba0e98 am: d2b77dc01c
am: ba9d45f792

Change-Id: Ic35934841e7522696260a4cee658269378ecb002
2019-10-24 03:08:43 -07:00
Junyu Lai
ba9d45f792 Merge "Set keepalive socket timeout to default value" am: 4c8baa10f9 am: 8d03ba0e98
am: d2b77dc01c

Change-Id: I37be1fdee14d9cc5f5c12fa7474b003130840ad6
2019-10-24 02:53:51 -07:00
Junyu Lai
d2b77dc01c Merge "Set keepalive socket timeout to default value" am: 4c8baa10f9
am: 8d03ba0e98

Change-Id: I5461398bd72c5c649aca862c3613f3ce29161820
2019-10-24 02:47:27 -07:00
Junyu Lai
8d03ba0e98 Merge "Set keepalive socket timeout to default value"
am: 4c8baa10f9

Change-Id: I60e888f24a7de7dba0a09cd4cec2d13d5b47bb91
2019-10-24 02:41:33 -07:00
junyulai
18c1592a6c Set keepalive socket timeout to default value
Fix: 142978377
Test: 1. atest android.net.cts.ConnectivityManagerTest\
         #testSocketKeepaliveLimitWifi --generate-new-metrics 10
      2. atest android.net.cts.ConnectivityManagerTest
      3. manual simulate connection timeout by changing test
         address

Change-Id: Idb786e38e87be253e0af11a9ffebf984bf23ead0
2019-10-24 15:42:36 +08:00
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