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
TreeHugger Robot
86a118c060
Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev
2021-07-01 10:53:27 +00:00
Treehugger Robot
a1e4470a3a
Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6 am: 0cdc510d6c am: eb650c896c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753822
Change-Id: Icd0524fac36d10aeeb20fbe9952e07b87e4ecb4f
2021-07-01 10:49:26 +00:00
Luke Huang
3835d1d46e
[automerger skipped] Merge "Fix the comments from aosp/1719018" into sc-dev am: bf9cb4dd18 -s ours am: 0b5b15744c -s ours
...
am skip reason: Merged-In I0953887d1d92a644a29a2e80521469c8cc2aa2fc with SHA-1 05b013c83f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076676
Change-Id: I6a37f966573dd4b1e74f1c98166d7057a4e8e535
2021-07-01 10:49:18 +00:00
Luke Huang
15c07273fa
[automerger skipped] Merge "Fix the comments from aosp/1719018" into sc-dev am: bf9cb4dd18 am: de8cdb81c6 -s ours
...
am skip reason: Merged-In I0953887d1d92a644a29a2e80521469c8cc2aa2fc with SHA-1 05b013c83f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076676
Change-Id: I152d59e2fef32797314cf1b3299bac7944100c33
2021-07-01 10:48:54 +00:00
Treehugger Robot
eb650c896c
Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6 am: 0cdc510d6c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753822
Change-Id: If48517cccabc9625cb5a7cc01babc3cff02d639b
2021-07-01 10:48:08 +00:00
Treehugger Robot
8ef6bfe5ae
Make notification icons and autocancel overlayable
...
Allow overlays to change the connectivity notification icons, and
whether the notifications are auto-cancelled.
This does not change default behavior, but is necessary to allow vendors
to adapt the notifications to their standards.
Bug: 173171709
Bug: 172048052
Test: atest NetworkNotificationManagerTest
Added test overlay, verified icon replaced
Original-Change: https://android-review.googlesource.com/1753822
Merged-In: Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7
Change-Id: Ibbb765a5e828b8b870cbfb81e89df2dbd2828be7
2021-07-01 10:44:09 +00:00
Luke Huang
de8cdb81c6
Merge "Fix the comments from aosp/1719018" into sc-dev am: bf9cb4dd18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076676
Change-Id: I1645777332b870001c496b464693eb96c223e78b
2021-07-01 10:28:35 +00:00
Treehugger Robot
0cdc510d6c
Merge "Make notification icons and autocancel overlayable" am: 2c7e0714c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753822
Change-Id: I77e1bcc4190656d3ea717575ebfc58d07df6b24f
2021-07-01 10:27:29 +00:00
Luke Huang
0b5b15744c
[automerger skipped] Merge "Fix the comments from aosp/1719018" into sc-dev am: bf9cb4dd18 -s ours
...
am skip reason: Merged-In I0953887d1d92a644a29a2e80521469c8cc2aa2fc with SHA-1 05b013c83f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15076676
Change-Id: I654e55beec5fed0775907e74e4b7a102cdbdbae1
2021-07-01 10:27:02 +00:00
Lucas Lin
f602754cbb
[automerger skipped] Merge "Simplify the return condition in stop()" into sc-dev am: b851d80de2 -s ours am: b0ba88e647 -s ours
...
am skip reason: Merged-In I2454c1c080d8954dd3785d4ac6e96fc4131fdb47 with SHA-1 40d931c474 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164994
Change-Id: I918d18ce9b3239051fd63982078066896cfbb242
2021-07-01 09:52:30 +00:00
Junyu Lai
5b19b0bb59
[automerger skipped] Merge "Fix network callback with the same PendingIntent does not release" into sc-dev am: 8ba13e99e8 -s ours am: 2e9bb1b3b9 -s ours
...
am skip reason: Merged-In I38bdea3a026a78a6dc34b5200d43a75b3cd1ac0c with SHA-1 1cc3f17413 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164991
Change-Id: I6989fe70adbdbfa8956cc99ab455476dfc791688
2021-07-01 09:52:22 +00:00
Lucas Lin
20288de195
[automerger skipped] Merge "Simplify the return condition in stop()" into sc-dev am: b851d80de2 am: 5f071c5925 -s ours
...
am skip reason: Merged-In I2454c1c080d8954dd3785d4ac6e96fc4131fdb47 with SHA-1 40d931c474 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164994
Change-Id: I63337b8034265d5a9a1b9e99691bfb26ca7b2fd1
2021-07-01 09:52:08 +00:00
Junyu Lai
291d7b3d5a
[automerger skipped] Merge "Fix network callback with the same PendingIntent does not release" into sc-dev am: 8ba13e99e8 am: 4bdfd01aee -s ours
...
am skip reason: Merged-In I38bdea3a026a78a6dc34b5200d43a75b3cd1ac0c with SHA-1 1cc3f17413 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164991
Change-Id: I4e233296bab5343025b903cb6e8456165bf1c30f
2021-07-01 09:51:58 +00:00
Luke Huang
bf9cb4dd18
Merge "Fix the comments from aosp/1719018" into sc-dev
2021-07-01 09:49:46 +00:00
Treehugger Robot
2c7e0714c6
Merge "Make notification icons and autocancel overlayable"
2021-07-01 09:49:37 +00:00
Lucas Lin
5f071c5925
Merge "Simplify the return condition in stop()" into sc-dev am: b851d80de2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164994
Change-Id: Ic23afbcaadffaf87ca760473dc5a10cd6e7c02eb
2021-07-01 09:37:44 +00:00
Junyu Lai
4bdfd01aee
Merge "Fix network callback with the same PendingIntent does not release" into sc-dev am: 8ba13e99e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164991
Change-Id: Ic875052f9a045c32a19457fa5d154b1502a6a1ab
2021-07-01 09:37:23 +00:00
Lucas Lin
b0ba88e647
[automerger skipped] Merge "Simplify the return condition in stop()" into sc-dev am: b851d80de2 -s ours
...
am skip reason: Merged-In I2454c1c080d8954dd3785d4ac6e96fc4131fdb47 with SHA-1 40d931c474 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164994
Change-Id: I1735c7d1c24693f7003bc52a98cae39e41832517
2021-07-01 09:35:47 +00:00
Junyu Lai
2e9bb1b3b9
[automerger skipped] Merge "Fix network callback with the same PendingIntent does not release" into sc-dev am: 8ba13e99e8 -s ours
...
am skip reason: Merged-In I38bdea3a026a78a6dc34b5200d43a75b3cd1ac0c with SHA-1 1cc3f17413 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164991
Change-Id: I0ad874b68ddada87348c5279ace98eae433211bc
2021-07-01 09:35:08 +00:00
Lucas Lin
b851d80de2
Merge "Simplify the return condition in stop()" into sc-dev
2021-07-01 09:09:39 +00:00
Junyu Lai
8ba13e99e8
Merge "Fix network callback with the same PendingIntent does not release" into sc-dev
2021-07-01 09:08:40 +00:00
Treehugger Robot
21ec633e39
Fix testGetAllNetworkStateSnapshots for non-cellular
...
bug: 192115694
Test: atest ConnectivityManagerTest#testGetAllNetworkStateSnapshots
Original-Change: https://android-review.googlesource.com/1749483
Merged-In: Ie7f637248302f3e6b61be69ef4c6a7a906e69275
Change-Id: Ie7f637248302f3e6b61be69ef4c6a7a906e69275
2021-07-01 08:47:03 +00:00