Commit Graph

1826 Commits

Author SHA1 Message Date
Adam Vartanian
d5544e43e2 DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4 -s ours
am: 50ec90be8d  -s ours

Change-Id: Ifcf62d3d2b4e46734419677980da68bcaf9c6f45
2018-01-11 22:56:22 +00:00
Adam Vartanian
50ec90be8d DO NOT MERGE Add CTS test for URI fix.
am: a02bbf31c4  -s ours

Change-Id: Ia1abdeb4be51aa8cfd7c4b15cba878887f2b539e
2018-01-11 22:49:06 +00:00
Treehugger Robot
3b38b58b1f Merge "Check kernel version before running qtaguid test" 2018-01-11 21:18:47 +00:00
Chenbo Feng
3a9e2dc232 Check kernel version before running qtaguid test
The qtaguid module is required for devices running kernel earlier then
4.9, but is no longer avaliable after that. Add a check before running
the kernel qtaguid native test so it doesn't fail on new devices.

Bug: 30950746
Test: run cts -m CtsNativeNetTestCases
Change-Id: I32bc77a4c51d8b64ac1a5411c75c56a51b84ea77
2018-01-11 11:15:06 -08:00
Android Merger
c660e3c3f2 Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2"
* changes:
  Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev am: 105ca148a7
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours am: bdf5a47c67  -s ours am: 39127a559b  -s ours
2018-01-10 19:56:41 +00:00
Android Merger
d813e180f6 Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
am: 105ca148a7

Change-Id: Iac57e88088eeb4a12c52e383c33a11a4a30adb1a
2018-01-10 19:56:14 +00:00
Adam Vartanian
2181876b7e DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours am: bdf5a47c67 -s ours
am: 39127a559b  -s ours

Change-Id: I49b152f261ea580aea41eb846ca0239520afc16f
2018-01-10 19:48:38 +00:00
Android Merger
420c69b8a1 Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c"
* changes:
  Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev am: dedfb2ca1f
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours am: cebea26b62  -s ours
2018-01-10 19:40:33 +00:00
Android Merger
ec3e88577f Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
am: dedfb2ca1f

Change-Id: I7072dfc37d644226d37689f4313ecf0ea19f7c28
2018-01-10 19:40:09 +00:00
Android Merger
105ca148a7 Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours am: bdf5a47c67  -s ours
2018-01-10 19:34:45 +00:00
Adam Vartanian
e104b8132d DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours am: df249cbcbb -s ours
am: cebea26b62  -s ours

Change-Id: I9ebe0964d0cd8777cff515a9083f6c808ce2542c
2018-01-10 19:34:37 +00:00
Android Merger
73ba7dddc3 Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
am: afff62b0b9

Change-Id: I2e29a7f60db399922822459d8e686d08ad4fd3a7
2018-01-10 19:34:19 +00:00
Adam Vartanian
39127a559b DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: d9ac06f2c2 -s ours
am: bdf5a47c67  -s ours

Change-Id: I1b319e1ee4806d7a513bcf6741240990eab74537
2018-01-10 19:30:12 +00:00
Android Merger
7aa66922dd Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986"
* changes:
  Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours
2018-01-10 19:27:09 +00:00
Android Merger
90b129d44e Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
am: 36407c961d

Change-Id: I16ebd986d9d762b0ae6920a4bc82574156eb228a
2018-01-10 19:26:44 +00:00
Android Merger
afff62b0b9 Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
* changes:
  Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 293664a1fb
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours
2018-01-10 19:26:23 +00:00
Android Merger
865adee70d Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
am: 293664a1fb

Change-Id: I4fb988a1a18189c4dd34d2154b42be227d346c82
2018-01-10 19:25:56 +00:00
Android Merger
dedfb2ca1f Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours
2018-01-10 19:25:30 +00:00
Android Merger
6517b3c979 Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
am: d9aadde604

Change-Id: I711a4cd0a6d5ce2a8a956c6d4e63f6e1e66445a5
2018-01-10 19:25:04 +00:00
Adam Vartanian
bdf5a47c67 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours
am: d9ac06f2c2  -s ours

Change-Id: I65c91a852c2e7f580a2b58098786b9e39d380d10
2018-01-10 19:23:29 +00:00
Adam Vartanian
db4ab12068 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours am: 7955a4e8d8 -s ours
am: d89f75a3db  -s ours

Change-Id: Ic80cd0c5b4661ce7b5f595ffa484e3afd8a3abde
2018-01-10 19:22:28 +00:00
Adam Vartanian
cebea26b62 DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: 175d980772 -s ours
am: df249cbcbb  -s ours

Change-Id: I4a60d7a706e5753fe7402a6d27c67deaa5ca02ef
2018-01-10 19:21:23 +00:00
Android Merger
293664a1fb Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: bc18e7e105
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours
2018-01-10 19:18:17 +00:00
Android Merger
c0b039c346 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
am: bc18e7e105

Change-Id: I383d04d335a27c522758b7838f124333822c5e02
2018-01-10 19:17:53 +00:00
Android Merger
36407c961d Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours
2018-01-10 19:17:29 +00:00
Android Merger
599f3a3c3f Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
am: fa209394f0

Change-Id: I3fa858e8b4a2da17f89f544b1ca802de84909830
2018-01-10 19:17:04 +00:00
Adam Vartanian
d9ac06f2c2 DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours
am: dfbb7a24e1  -s ours

Change-Id: I802ec14db281665d47ae01ab90b0f8797237a2f2
2018-01-10 19:16:50 +00:00
Android Merger
d9aadde604 Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
* changes:
  Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: f59fbfb5a4
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours
2018-01-10 19:15:20 +00:00
Android Merger
c8d546b3ab Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
am: f59fbfb5a4

Change-Id: I845720eea2e308e886afd2c900f66bfdff24679d
2018-01-10 19:14:50 +00:00
Adam Vartanian
d89f75a3db DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
am: 7955a4e8d8  -s ours

Change-Id: If66b41e17d12e833e1b93a8104e88220852c77b0
2018-01-10 19:14:29 +00:00
Android Merger
bc18e7e105 Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
* changes:
  Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours
2018-01-10 19:13:47 +00:00
Adam Vartanian
2ba7ef5b48 Merge changes from topic "mm" into marshmallow-cts-dev
am: 2996702607

Change-Id: I210f8b36685e9e1dbcc2916b921501ed55ddb1fb
2018-01-10 19:13:07 +00:00
Adam Vartanian
df249cbcbb DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours
am: 175d980772  -s ours

Change-Id: I9f2de682ef6178fa6c58781e393f53b96ccb2e1e
2018-01-10 19:12:57 +00:00
Adam Vartanian
dfbb7a24e1 DO NOT MERGE Add CTS test for URI fix.
am: 1efb5151db  -s ours

Change-Id: I7cb28b5ac56f616a23a99d466606da8221eaa58e
2018-01-10 19:12:49 +00:00
Android Merger
fa209394f0 Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours
2018-01-10 19:11:25 +00:00
Adam Vartanian
f93369d103 Merge changes from topic "n1" into nougat-mr1-cts-dev
am: 76faaa3996

Change-Id: I8c07170ab322c1ea8d40df9302733132a604b0c9
2018-01-10 19:10:54 +00:00
Adam Vartanian
7955a4e8d8 DO NOT MERGE Add CTS test for URI fix.
am: 08044f045c  -s ours

Change-Id: I41b3f407c0e7714b80e935fb7ae556a2558cd143
2018-01-10 19:10:30 +00:00
Android Merger
f59fbfb5a4 Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours
2018-01-10 19:08:34 +00:00
Adam Vartanian
0aa1444c8e Merge changes from topic "n" into nougat-cts-dev
am: a220d6d27d

Change-Id: I406953a4713b768012d123a33db06268e8cf3799
2018-01-10 19:07:44 +00:00
Adam Vartanian
175d980772 DO NOT MERGE Add CTS test for URI fix.
am: 53a9c9bc34  -s ours

Change-Id: I1402f70414d6ba6b89224d37af32bbe47157d1b5
2018-01-10 19:07:26 +00:00
Treehugger Robot
76faaa3996 Merge changes from topic "n1" into nougat-mr1-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:06:35 +00:00
Treehugger Robot
2996702607 Merge changes from topic "mm" into marshmallow-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 19:05:55 +00:00
Treehugger Robot
a220d6d27d Merge changes from topic "n" into nougat-cts-dev
* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
2018-01-10 18:59:52 +00:00
Adam Vartanian
a02bbf31c4 DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 13:33:23 -08:00
Adam Vartanian
08044f045c DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 13:31:30 -08:00
Adam Vartanian
53a9c9bc34 DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 12:57:18 -08:00
Adam Vartanian
1efb5151db DO NOT MERGE Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
(cherry picked from commit a01da8536c)
2018-01-08 12:52:51 -08:00
Sudheer Shanka
a353a9bf2b Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev
am: e352866bee

Change-Id: I62d301dd0c4f026ea4f52de0ad706d50ff5382e4
2018-01-06 01:42:28 +00:00
Adam Vartanian
5dc6849013 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c
am: cd4ab882f0

Change-Id: I2f49f443143274a2deeccbdd7aa85d9484997c44
2018-01-05 20:43:59 +00:00
Etan Cohen
d4c6acbb54 Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b
am: 66aec9074f

Change-Id: Ib7bb8eff71a9358bea9a1425b08e9a43d3f2cb2c
2018-01-05 19:39:42 +00:00