Orion Hodson
29fb1c1477
[automerger skipped] Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b -s ours am: 504d5ac68b -s ours
...
am skip reason: Merged-In I06cbc7e06e112d61575fad6ad0783348c94e3df2 with SHA-1 c3815ee358 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15163615
Change-Id: I2b2b0bbd10c57222f53551a0a56ceacd0270476d
2021-07-02 05:10:02 +00:00
Orion Hodson
faebcc6419
[automerger skipped] Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b am: ce47122578 -s ours
...
am skip reason: Merged-In I06cbc7e06e112d61575fad6ad0783348c94e3df2 with SHA-1 c3815ee358 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15163615
Change-Id: I68a23288a5a33eeb7ac5eb01c4416d7c19fd6fea
2021-07-02 05:09:53 +00:00
Orion Hodson
ce47122578
Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15163615
Change-Id: Iae64d04b662b76582b7579d541d90f6acf6f90ad
2021-07-02 04:57:59 +00:00
Orion Hodson
504d5ac68b
[automerger skipped] Remove dependency on stable.core.platform.api.stubs am: 5e5c287d6b -s ours
...
am skip reason: Merged-In I06cbc7e06e112d61575fad6ad0783348c94e3df2 with SHA-1 c3815ee358 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15163615
Change-Id: Iaddcc6f6dca44c333073032a172c91f0dc7b323d
2021-07-02 04:57:13 +00:00
Remi NGUYEN VAN
c46754a188
Merge "Remove workarounds to use core platform API" am: 78dcc73e4c am: 31dbe8b122 am: df1ab0aa2b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754889
Change-Id: I30dc144f261cf8d284ec770935ecc75c8503cf9d
2021-07-02 04:49:23 +00:00
Treehugger Robot
4b650196a0
Merge "Test Entitlement when telephony is present" am: 93773f0aa0 am: f780194b25 am: 505f30c572
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336
Change-Id: If2b92a9711a7fc12636ed54243f92f25a301825b
2021-07-02 04:49:09 +00:00
Remi NGUYEN VAN
1f0def333d
Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036 am: b786afa6e3 am: 899b99040c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753823
Change-Id: I6dd0bdcaa8720e4ba0dea8e314e1b15cf6b233f6
2021-07-02 04:48:56 +00:00
Remi NGUYEN VAN
df1ab0aa2b
Merge "Remove workarounds to use core platform API" am: 78dcc73e4c am: 31dbe8b122
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754889
Change-Id: Ib01bbc0cfec540a6e811ac874c4e731734490dfb
2021-07-02 04:44:46 +00:00
Remi NGUYEN VAN
31dbe8b122
Merge "Remove workarounds to use core platform API" am: 78dcc73e4c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1754889
Change-Id: Ia0f8f5ab44267b0007364e6c1959edf22c952300
2021-07-02 04:41:25 +00:00
Treehugger Robot
505f30c572
Merge "Test Entitlement when telephony is present" am: 93773f0aa0 am: f780194b25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336
Change-Id: I0df5ed172ea00f2d2bf44e8f37c1b417fc9245b7
2021-07-02 04:41:18 +00:00
Remi NGUYEN VAN
78dcc73e4c
Merge "Remove workarounds to use core platform API"
2021-07-02 04:37:23 +00:00
Treehugger Robot
f780194b25
Merge "Test Entitlement when telephony is present" am: 93773f0aa0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735336
Change-Id: Ib5734aca35f2aee00d63b5684f6dd06b1063ef26
2021-07-02 04:37:15 +00:00
Remi NGUYEN VAN
899b99040c
Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036 am: b786afa6e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753823
Change-Id: I283c7e665673f148b447847ff1d96a2efa70f11c
2021-07-02 04:37:08 +00:00
Treehugger Robot
93773f0aa0
Merge "Test Entitlement when telephony is present"
2021-07-02 04:28:18 +00:00
Remi NGUYEN VAN
b786afa6e3
Merge "Fix CtsNetTestCases in instant mode" am: 81be2bd036
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753823
Change-Id: I84ec31354974c4913d6c4ac94a955054697180ff
2021-07-02 04:19:02 +00:00
Remi NGUYEN VAN
81be2bd036
Merge "Fix CtsNetTestCases in instant mode"
2021-07-02 04:07:05 +00:00
Paul Hu
b68eda8105
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" am: 7079b72fa6 am: 9e98dea823 am: 6bc989a586
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751023
Change-Id: Ie2685f7264dd127048b8b36539d6739458248302
2021-07-02 02:03:14 +00:00
Paul Hu
6bc989a586
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" am: 7079b72fa6 am: 9e98dea823
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751023
Change-Id: I18ab49638b3c51f4217c84dcf18a5b4fc7007181
2021-07-02 01:44:52 +00:00
Paul Hu
9e98dea823
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature" am: 7079b72fa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751023
Change-Id: I4c87ecdd3d05305aa47a7569a22f370aedf4b585
2021-07-02 01:26:27 +00:00
Paul Hu
7079b72fa6
Merge "Change to REQUEST from LISTEN for mobile data preferred uids feature"
2021-07-02 01:10:56 +00:00
Remi NGUYEN VAN
b2e919f9da
Remove workarounds to use core platform API
...
Core platform API stubs are now correctly included in module_current and
system_server_current, so workarounds used to use such APIs can be
removed.
OsCompat and InetAddressCompat were only necessary because manually
adding the stubs did not resolve the problem for classes that had
public API stubs, which shadowed the module API stubs.
The manual stubs dependency was already removed in another change. Also
remove the service jar dependency on android_system_server_stubs_current
as it is already included in sdk_version system_server_current.
Bug: 183097033
Test: atest CtsNetTestCases
Change-Id: Id448be03b679f832edb24f1b77f471227faf5268
2021-07-02 10:05:07 +09:00
Orion Hodson
5e5c287d6b
Remove dependency on stable.core.platform.api.stubs
...
Bug: 183097033
Test: m droid
Original-Change: https://android-review.googlesource.com/1751523
Merged-In: I06cbc7e06e112d61575fad6ad0783348c94e3df2
Change-Id: I06cbc7e06e112d61575fad6ad0783348c94e3df2
2021-07-02 00:42:52 +00:00
Sudheer Shanka
fc60f96e94
[automerger skipped] Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3 -s ours am: ba4f3650c2 -s ours
...
am skip reason: Merged-In Ib90f0045cb574ada792c5d43fcc359c22d20f3a4 with SHA-1 f90750e26a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15167635
Change-Id: I00016820f6414f7b70f18e0501dd72b9557a3088
2021-07-01 23:55:01 +00:00
Sudheer Shanka
a51912a805
[automerger skipped] Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3 am: 311b28c020 -s ours
...
am skip reason: Merged-In Ib90f0045cb574ada792c5d43fcc359c22d20f3a4 with SHA-1 f90750e26a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15167635
Change-Id: Ifd5205c1f1a50da430cba218acd3b48c746cd411
2021-07-01 23:52:14 +00:00
Sudheer Shanka
311b28c020
Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15167635
Change-Id: Ibcdf57e5dad03cea9e07cc18c1c3c5b6acdcb5f0
2021-07-01 23:40:25 +00:00
Sudheer Shanka
ba4f3650c2
[automerger skipped] Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev am: 0a224da8d3 -s ours
...
am skip reason: Merged-In Ib90f0045cb574ada792c5d43fcc359c22d20f3a4 with SHA-1 f90750e26a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15167635
Change-Id: I53c56729ec76a216edfc4a4c7632be68d72ec604
2021-07-01 23:39:26 +00:00
Sudheer Shanka
0a224da8d3
Merge "Skip NetworkPolicyManagerTest on unsupported devices." into sc-dev
2021-07-01 23:28:45 +00:00
Orion Hodson
cb68b6e8b5
Merge "Remove dependency on stable.core.platform.api.stubs" am: f15f2769b4 am: cfa0d8026b am: f59ce8f0cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751523
Change-Id: If42447a56367e3ae96b8ee60a59b90380326791f
2021-07-01 19:48:22 +00:00
Orion Hodson
f59ce8f0cc
Merge "Remove dependency on stable.core.platform.api.stubs" am: f15f2769b4 am: cfa0d8026b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751523
Change-Id: I626a0817b64678929054fd26aa0ca22372ca2f2c
2021-07-01 19:29:04 +00:00
Orion Hodson
cfa0d8026b
Merge "Remove dependency on stable.core.platform.api.stubs" am: f15f2769b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751523
Change-Id: I94b8ca7d55df35e5f118b69a07b5152b2d0b207b
2021-07-01 19:08:36 +00:00
Orion Hodson
f15f2769b4
Merge "Remove dependency on stable.core.platform.api.stubs"
2021-07-01 18:53:17 +00:00
Sudheer Shanka
5bb04c584d
Merge "Skip tests on unsupported devices." am: 0dc6206752 am: f8110a2cda am: d80b8cc4a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753865
Change-Id: I6ed43269eb2c061b342afef1d109078b345370d1
2021-07-01 17:49:24 +00:00
Sudheer Shanka
d80b8cc4a9
Merge "Skip tests on unsupported devices." am: 0dc6206752 am: f8110a2cda
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753865
Change-Id: Ib0d27578e15d6f4af77723700ca564ecf15c0f4e
2021-07-01 17:28:49 +00:00
Sudheer Shanka
f8110a2cda
Merge "Skip tests on unsupported devices." am: 0dc6206752
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753865
Change-Id: Icaea4cd21c2fa68e7340db2fe82a4b41687470a5
2021-07-01 17:16:06 +00:00
Sudheer Shanka
fe89aaad47
Skip NetworkPolicyManagerTest on unsupported devices.
...
Fixes: 192473577
Test: atest CtsHostsideNetworkTests:HostsideNetworkPolicyManagerTests
Change-Id: Ib90f0045cb574ada792c5d43fcc359c22d20f3a4
Merged-In: Ib90f0045cb574ada792c5d43fcc359c22d20f3a4
2021-07-01 17:10:02 +00:00
Sudheer Shanka
0dc6206752
Merge "Skip tests on unsupported devices."
2021-07-01 16:59:46 +00:00
TreeHugger Robot
49019ce1ea
[automerger skipped] Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16 -s ours am: 7a10686a8d -s ours
...
am skip reason: Merged-In Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7 with SHA-1 3a8198c3ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450
Change-Id: Ib9b6bfcf8361574ef0dca52979d46e994e68c49a
2021-07-01 15:52:48 +00:00
TreeHugger Robot
e1a654f639
[automerger skipped] Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16 am: 5e427a411e -s ours
...
am skip reason: Merged-In Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7 with SHA-1 3a8198c3ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450
Change-Id: I7e6d538a544040b279fb3b54f22b924a3af05563
2021-07-01 15:52:10 +00:00
TreeHugger Robot
5e427a411e
Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450
Change-Id: I07a3e28797aaff19d7edd1ac7c965399dd49eaaa
2021-07-01 15:37:38 +00:00
TreeHugger Robot
7a10686a8d
[automerger skipped] Merge "Make notification icons and autocancel overlayable" into sc-dev am: 2a512b4a16 -s ours
...
am skip reason: Merged-In Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7 with SHA-1 3a8198c3ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172450
Change-Id: I887655da5225567835f9396decbee63ef7c36b62
2021-07-01 15:36:32 +00:00
TreeHugger Robot
2a512b4a16
Merge "Make notification icons and autocancel overlayable" into sc-dev
2021-07-01 15:24:43 +00:00
TreeHugger Robot
a8c5aa0818
[automerger skipped] Merge "Dump the protocol of IPv4 offload rule" into sc-dev am: a575bce0ed am: 1dbd4239a7 -s ours
...
am skip reason: Merged-In Idae1042cfb454cc97b9b103587f11bc0700e0787 with SHA-1 a4a7825e13 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164997
Change-Id: If70318182422ea0163ce1cdd4054c542686e6bcb
2021-07-01 11:18:56 +00:00
TreeHugger Robot
475025a7f7
[automerger skipped] Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060 am: 1f798f9800 -s ours
...
am skip reason: Merged-In Ie7f637248302f3e6b61be69ef4c6a7a906e69275 with SHA-1 21ec633e39 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489
Change-Id: I8e5933d196189943f0f61c4eef3471d45df12e08
2021-07-01 11:18:51 +00:00
TreeHugger Robot
0dc1cb6238
[automerger skipped] Merge "Dump the protocol of IPv4 offload rule" into sc-dev am: a575bce0ed -s ours am: 8ddf81e278 -s ours
...
am skip reason: Merged-In Idae1042cfb454cc97b9b103587f11bc0700e0787 with SHA-1 3004f0d8d9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164997
Change-Id: Iff11eb7e3809c13095d5ddcdce0839095cbd0678
2021-07-01 11:13:33 +00:00
TreeHugger Robot
e10ed060eb
[automerger skipped] Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060 -s ours am: 4184b44a2a -s ours
...
am skip reason: Merged-In Ie7f637248302f3e6b61be69ef4c6a7a906e69275 with SHA-1 4f0546ccbe is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489
Change-Id: If00cdeb2314c413f2837ff967bd0134997e59b68
2021-07-01 11:13:26 +00:00
TreeHugger Robot
1dbd4239a7
Merge "Dump the protocol of IPv4 offload rule" into sc-dev am: a575bce0ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164997
Change-Id: I5e167aaf42b5d4cbf23eef34dd2e1ed7c66fc326
2021-07-01 11:03:45 +00:00
TreeHugger Robot
1f798f9800
Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489
Change-Id: I19519b91d29533ff459c14bca0038d6832db1da6
2021-07-01 11:03:31 +00:00
TreeHugger Robot
8ddf81e278
[automerger skipped] Merge "Dump the protocol of IPv4 offload rule" into sc-dev am: a575bce0ed -s ours
...
am skip reason: Merged-In Idae1042cfb454cc97b9b103587f11bc0700e0787 with SHA-1 3004f0d8d9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164997
Change-Id: I50aaf9f2abe8b6be6decf3bc8eda8c385004651f
2021-07-01 11:02:41 +00:00
TreeHugger Robot
4184b44a2a
[automerger skipped] Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev am: 86a118c060 -s ours
...
am skip reason: Merged-In Ie7f637248302f3e6b61be69ef4c6a7a906e69275 with SHA-1 4f0546ccbe is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108489
Change-Id: If270a8bb58cb47feca8e8d01b43b12c1ecfe3e24
2021-07-01 11:02:32 +00:00
TreeHugger Robot
a575bce0ed
Merge "Dump the protocol of IPv4 offload rule" into sc-dev
2021-07-01 10:54:44 +00:00