Cody Kesting
3dbe5acf0e
[automerger skipped] Invoke onConnectivityReport on registering ConnectivityDiagnostics. am: fe059d8c30 am: f37380f8cf -s ours
...
am skip reason: Change-Id I924ba8fdcc847f453557021591bde38602fe089c with SHA-1 b77bf707c6 is in history
Change-Id: I176af823f438a9fc095af176563b141d7acc98fb
2020-04-01 01:41:12 +00:00
Cody Kesting
d6454902ac
[automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: bb578182f3 -s ours am: 6bf7b749ec -s ours
...
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 b1cd3ebfea is in history
Change-Id: I6505fc96431a2a283c9e1f0c3a39c0873827b80b
2020-04-01 01:41:00 +00:00
Cody Kesting
f37380f8cf
Invoke onConnectivityReport on registering ConnectivityDiagnostics. am: fe059d8c30
...
Change-Id: I20430c60e27b9c3b4210ec037b71accac376ca44
2020-04-01 01:33:19 +00:00
Cody Kesting
6bf7b749ec
[automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: bb578182f3 -s ours
...
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 b1cd3ebfea is in history
Change-Id: Id445e7883fa4aa86f97488535c517471b6c5641f
2020-04-01 01:29:59 +00:00
Cody Kesting
bb578182f3
Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev
...
* changes:
Update CS helper for clearing NetworkCapabilities UIDs.
Simplify unregister logic for Connectivity Diagnostics callbacks.
Clarify comments for Connectivity Diagnostics reports.
Sort administrator UIDs for NetworkCapabilities.
Add combine() and equals() for NetworkCapabilities admin UIDs.
Use IBinder as key for ConnectivityDiagnostics storage in CS.
Decrement networkRequestPerUid when callbacks are unregistered.
Invoke onConnectivityReport on registering ConnectivityDiagnostics.
2020-04-01 01:13:11 +00:00
Cody Kesting
8e44b3b642
Merge "Update CS helper for clearing NetworkCapabilities UIDs." am: 28ce6a8970 am: 2ecef3416b am: a137937176
...
Change-Id: Ib472635e96fa029f0e36a7132bd134a0e68cfd49
2020-03-31 20:58:02 +00:00
Cody Kesting
9d7c8ded01
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks." am: bf4f1d9e98 am: b51ef5b7d7 am: f46558e41e
...
Change-Id: Ieb262cf4c46dafc1a309d87715fe9a05afaa2287
2020-03-31 20:57:47 +00:00
Cody Kesting
a137937176
Merge "Update CS helper for clearing NetworkCapabilities UIDs." am: 28ce6a8970 am: 2ecef3416b
...
Change-Id: I4560ffd4558288854e2cb493f6e82a95bc45a88d
2020-03-31 20:45:25 +00:00
Cody Kesting
f46558e41e
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks." am: bf4f1d9e98 am: b51ef5b7d7
...
Change-Id: I50aa039a875be2fcbcb0d82c384d4cbd585a951d
2020-03-31 20:45:06 +00:00
Cody Kesting
2ecef3416b
Merge "Update CS helper for clearing NetworkCapabilities UIDs." am: 28ce6a8970
...
Change-Id: I6769788d7c0fade7bcab912c6a68f91161b25992
2020-03-31 20:33:17 +00:00
Cody Kesting
b51ef5b7d7
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks." am: bf4f1d9e98
...
Change-Id: I798827a3505f460a5baf633ee2d3fb2422d65137
2020-03-31 20:32:59 +00:00
Cody Kesting
eef268f664
Merge "Clarify comments for Connectivity Diagnostics reports." am: 87ce14f328 am: 1d99c7333f am: 84cfd6c6e4
...
Change-Id: I617f5361a7564d3d4fe2a962887e4666d2a0695f
2020-03-31 20:19:45 +00:00
Cody Kesting
f041d03a88
Merge "Sort administrator UIDs for NetworkCapabilities." am: c350963548 am: 8d84479831 am: ad6fd5bfc8
...
Change-Id: Idd669be0bd07fe346ab3c007cae2fe15aa3556a4
2020-03-31 20:19:18 +00:00
Cody Kesting
5c436fa230
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: e4df39ba4b am: e0463c56eb am: 975c5c699a
...
Change-Id: I019ac5a5d19f4bed5a43b94a04313a66ef6d32fd
2020-03-31 20:19:03 +00:00
Cody Kesting
28ce6a8970
Merge "Update CS helper for clearing NetworkCapabilities UIDs."
2020-03-31 20:18:17 +00:00
Cody Kesting
082e3a90eb
[automerger skipped] Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: c161f59909 -s ours am: 1080a7c2b5 -s ours
...
am skip reason: Change-Id Id630fe9d76aacdaf038fdaa5360f0327520ee0c3 with SHA-1 9f8773c32e is in history
Change-Id: Ice07a22a570cc6e2b215a21ac158e309ff4e93b4
2020-03-31 20:18:13 +00:00
Cody Kesting
bf4f1d9e98
Merge "Simplify unregister logic for Connectivity Diagnostics callbacks."
2020-03-31 20:18:01 +00:00
Cody Kesting
12fad8c98d
Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS." am: 852715df47 am: 8426b0a531 am: be014cd28e
...
Change-Id: I64be355630a1cb5f501b38ad1292823260fb1ddf
2020-03-31 20:17:56 +00:00
Benedict Wong
1341c7273b
[automerger skipped] Merge changes I97ba5903,Icd80b368 into rvc-dev am: d3d72d4452 -s ours am: 726396aab9 -s ours
...
am skip reason: Change-Id I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c with SHA-1 cbb19fcba7 is in history
Change-Id: I012b8d8da51b53361d0b278cc1d7fcc0f259e250
2020-03-31 20:16:10 +00:00
Benedict Wong
b555cd7604
[automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: c0192c1df6 -s ours am: 4fbe9a35ef -s ours
...
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 d6e8d4ab71 is in history
Change-Id: I8e5cf4b83f05068ca2715b9715204af268320ca0
2020-03-31 20:15:44 +00:00
Benedict Wong
dba034704f
Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 0943dac366 am: 538a86d63e am: a6130d4a68
...
Change-Id: I6efac8082e1446db77ee32aed261bd0060709d24
2020-03-31 19:08:23 +00:00
Cody Kesting
8869bbc13d
Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6 am: 21f7dba1e1 am: f6adaa4185
...
Change-Id: I59b35072f334cd6aef6c9a2541b8cc0482750323
2020-03-31 19:03:11 +00:00
Cody Kesting
2690083cd4
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa am: 7439991aec am: 22f3171c07
...
Change-Id: I8602fabac45469f1e5873459ccfb03561348ffcb
2020-03-31 18:58:48 +00:00
Cody Kesting
fe0d1ed8eb
Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5 am: 2ea7a457b0 am: 5c96dc912b
...
Change-Id: Ib5491610873fd904a6e97f0f270a5b777ceaa4ba
2020-03-31 18:53:51 +00:00
Cody Kesting
84cfd6c6e4
Merge "Clarify comments for Connectivity Diagnostics reports." am: 87ce14f328 am: 1d99c7333f
...
Change-Id: I4e6452b4875a8c3e3739dea4d3bc281a006156eb
2020-03-31 18:17:26 +00:00
Cody Kesting
ad6fd5bfc8
Merge "Sort administrator UIDs for NetworkCapabilities." am: c350963548 am: 8d84479831
...
Change-Id: I453f81bcb7c426ab4b529acce5c32c502a29331b
2020-03-31 18:17:14 +00:00
Cody Kesting
96803b3f90
Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: c161f59909 am: 2a26e7cfa8
...
Change-Id: I7b3cc12d7326e68ca27361a7ef24574c104f8a42
2020-03-31 18:16:21 +00:00
Cody Kesting
975c5c699a
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: e4df39ba4b am: e0463c56eb
...
Change-Id: Ic8fc22f0eb47836053fc6b9423018c16ae46ef46
2020-03-31 18:16:18 +00:00
Cody Kesting
1d99c7333f
Merge "Clarify comments for Connectivity Diagnostics reports." am: 87ce14f328
...
Change-Id: If353d65d28842c6eb621a8881e9279a018fa9ffa
2020-03-31 18:02:08 +00:00
Cody Kesting
8d84479831
Merge "Sort administrator UIDs for NetworkCapabilities." am: c350963548
...
Change-Id: I4cfb80b1eb9edc5ad90a1aff957a0f6d1f3eb522
2020-03-31 18:01:47 +00:00
Cody Kesting
1080a7c2b5
[automerger skipped] Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: c161f59909 -s ours
...
am skip reason: Change-Id Id630fe9d76aacdaf038fdaa5360f0327520ee0c3 with SHA-1 7b987276db is in history
Change-Id: Ic3e78575a0b50cfd6ca8e309461214ba4c72b818
2020-03-31 18:01:33 +00:00
Cody Kesting
2a26e7cfa8
Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: c161f59909
...
Change-Id: I729db9d97d69a088c272a64d270aa05be474ed87
2020-03-31 18:01:30 +00:00
Cody Kesting
e0463c56eb
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: e4df39ba4b
...
Change-Id: Ic8b353d233eda759100952e126d77e9dd48005e5
2020-03-31 18:01:24 +00:00
Chiachang Wang
d7a92cf89e
Merge "Update constructor of NetworkMonitor" am: 3402ee64ed am: 63f5da7bb6 am: 42368e5de2
...
Change-Id: I8d10209a18c3d1c76f57b27bab75168a4af76c69
2020-03-31 17:56:15 +00:00
Lucas Lin
d3adef827c
[automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36 am: 4c3ce3670c -s ours am: 66dc3653df -s ours
...
am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 88cef1a242 is in history
Change-Id: I6940be2eb3ff41568d86f20632454e549667640c
2020-03-31 17:54:05 +00:00
Xiao Ma
ecd7596bc1
[automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08 -s ours am: b57e276a52 -s ours
...
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 ef40b406c5 is in history
Change-Id: I00ee1aca684632edb1f4af4a11af524f93bf52b7
2020-03-31 17:53:31 +00:00
Aaron Huang
70480a6e72
Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b am: 3425e2651a
...
Change-Id: If22bcfadfc71bb8dd8be08740be202482ed23dd3
2020-03-31 17:48:44 +00:00
Android Build Merger (Role)
bba1be2bea
Merge "Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f am: ec3a3796bf" into rvc-d1-dev-plus-aosp
2020-03-31 17:48:15 +00:00
TreeHugger Robot
26b4295c50
[automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours am: aa7e7dabc9 -s ours
...
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 9eb9399321 is in history
Change-Id: I120f81565e4862505c4fe36793943d13391e2486
2020-03-31 17:47:52 +00:00
Lucas Lin
cf5be6f21d
Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
...
am: ec3a3796bf
Change-Id: Ia370fddf5693c67ca82043cdff2c5a35928a0e08
2020-03-31 10:47:37 -07:00
Cody Kesting
c161f59909
Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev
2020-03-31 17:46:57 +00:00
Lucas Lin
6dfffdf4c5
Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c am: ac0d8ed4e8
...
Change-Id: Icaefd5ae4ad814385f2aa0b83aa94a88167c8af3
2020-03-31 17:46:45 +00:00
Lucas Lin
74da2d4e59
Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f am: ec3a3796bf
...
Change-Id: Ia1f4f43d9192b6ad84a6f297ccf3114143b9900b
2020-03-31 17:46:00 +00:00
Remi NGUYEN VAN
edf868f706
[automerger skipped] Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9 -s ours am: da337f3100 -s ours
...
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 d7d24015a5 is in history
Change-Id: I5b57ee16e81765981fb4154aa27c1be4ecb85d02
2020-03-31 17:44:07 +00:00
Cody Kesting
87ce14f328
Merge "Clarify comments for Connectivity Diagnostics reports."
2020-03-31 17:43:44 +00:00
Cody Kesting
c350963548
Merge "Sort administrator UIDs for NetworkCapabilities."
2020-03-31 17:43:02 +00:00
Cody Kesting
e4df39ba4b
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs."
2020-03-31 17:42:18 +00:00
Benedict Wong
4ea360e537
Merge changes I97ba5903,Icd80b368 into rvc-dev am: d3d72d4452 am: 6a0996a110
...
Change-Id: I7f211c7a4d383523e574c8ce969ee28687a42929
2020-03-31 17:36:58 +00:00
Benedict Wong
eef8baaefd
[automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: c0192c1df6 am: 701b0cc046 -s ours
...
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 feff1cde9a is in history
Change-Id: I192079b09c3fc9292fabc2208059f2c8698a9e4d
2020-03-31 17:35:12 +00:00
Cody Kesting
be014cd28e
Merge "Use IBinder as key for ConnectivityDiagnostics storage in CS." am: 852715df47 am: 8426b0a531
...
Change-Id: Ia63d6ab70027e4d1b389a05f3d46162a68747e77
2020-03-31 17:35:09 +00:00