Commit Graph

9425 Commits

Author SHA1 Message Date
Chiachang Wang
c7e9a49d4d [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours am: de56acb0a0 -s ours
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 0ab5158418 is in history

Change-Id: I8ab7bf30792b69ec23cf28a17771ffe243abd162
2020-04-01 09:24:08 +00:00
Chiachang Wang
eda2f43954 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 am: 3844a61841 -s ours
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 0ab5158418 is in history

Change-Id: I0b4d8e47e8900c0aaf9cee4e95956401e3087b30
2020-04-01 09:23:54 +00:00
Chiachang Wang
de56acb0a0 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 0ab5158418 is in history

Change-Id: I728c5080b92ffa7c8c2524f2430252af1faee963
2020-04-01 09:11:18 +00:00
Chiachang Wang
3844a61841 Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9
Change-Id: Iea5f995291bdbe3081c8f7ded5bf4f3f50e6c7d1
2020-04-01 09:11:13 +00:00
Aaron Huang
89fc8d8b86 [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871 am: 72b40b49e0 -s ours am: 74f8e59f2f -s ours
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 fd23dbbf07 is in history

Change-Id: Ieb1eb1874b6160999da847557dac5e8d4a184e3f
2020-04-01 06:02:52 +00:00
Chalard Jean
3cf79ff728 [automerger skipped] Update NetworkAgentConfig API for council comments am: aea539a13e am: 1b2a71f06d -s ours am: 4c411963c8 -s ours
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 15a3adbdf3 is in history

Change-Id: I3c2a67c8c613fb6a7bc37d004b6c4a3f44cd761c
2020-04-01 06:02:51 +00:00
Chalard Jean
5dd77ec54a [automerger skipped] Update the NetworkAgent API for council comments am: f5d1bfd77f am: 4bc45aba0a -s ours am: f74dd50330 -s ours
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 68d0e42789 is in history

Change-Id: I1c5f6c675417272217a4c15bdae2c8f9f5c35d5a
2020-04-01 06:02:48 +00:00
Aaron Huang
74f8e59f2f [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871 am: 72b40b49e0 -s ours
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 fd23dbbf07 is in history

Change-Id: Ic318324c0424d0ad106b0c92c1cb55ba616c6b2b
2020-04-01 05:58:30 +00:00
Chalard Jean
4c411963c8 [automerger skipped] Update NetworkAgentConfig API for council comments am: aea539a13e am: 1b2a71f06d -s ours
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 15a3adbdf3 is in history

Change-Id: Icf2ec01fe46cf905b2636d064fd68e2ff9e546e7
2020-04-01 05:58:23 +00:00
Chalard Jean
f74dd50330 [automerger skipped] Update the NetworkAgent API for council comments am: f5d1bfd77f am: 4bc45aba0a -s ours
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 68d0e42789 is in history

Change-Id: Iac85b28ac13c794999110e7cd54f1816dd298967
2020-04-01 05:58:14 +00:00
Aaron Huang
72b40b49e0 Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871
Change-Id: I553a53bc4612fc367591738d9669e354730fdacc
2020-04-01 05:47:04 +00:00
Chalard Jean
1b2a71f06d Update NetworkAgentConfig API for council comments am: aea539a13e
Change-Id: I195c50ee1db2dd26b7c06f4ecbd6dbccc38895ef
2020-04-01 05:46:58 +00:00
Chalard Jean
4bc45aba0a Update the NetworkAgent API for council comments am: f5d1bfd77f
Change-Id: I1337011740d2c34f886a6d2975bd3da24f371bb8
2020-04-01 05:46:50 +00:00
Aaron Huang
f210e24871 Merge changes from topics "networkagent_api", "networkprovider_api"
* changes:
  Update the NetworkProvider API for council comments
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
2020-04-01 05:33:28 +00:00
Chiachang Wang
f7d30445c7 Update constructor of NetworkMonitor
Remove redundant parameter.

Bug: 152374582
Test: m -j40 ; atest FrameworksNetIntegrationTests
Merged-In: I3a636f0ea5145ac4435e06a9827bb8e01862542d
Change-Id: I3a636f0ea5145ac4435e06a9827bb8e01862542d
2020-04-01 02:12:32 +00:00
Cody Kesting
00037cd35f [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: bb578182f3 am: 5e543c05ed -s ours
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 b1cd3ebfea is in history

Change-Id: Ic6ec72c3d809fab0f50a6f4b386ebf050bf60d25
2020-04-01 01:41:34 +00:00
Cody Kesting
90e826c512 [automerger skipped] Simplify unregister logic for Connectivity Diagnostics callbacks. am: 5d51a917f5 am: f164a670c8 -s ours
am skip reason: Change-Id I9096969a1bf33da72b117f5bbc88257df805e688 with SHA-1 2b1a61cf4b is in history

Change-Id: I92333ea01c7b82c132ba3c3d83a7ce4f43b3a09e
2020-04-01 01:41:30 +00:00
Cody Kesting
deeac58bf2 [automerger skipped] Clarify comments for Connectivity Diagnostics reports. am: 7d4ef21010 am: 006ad761b3 -s ours
am skip reason: Change-Id I748bd9ded72a34d89f13bd4362d6d4da62b910b8 with SHA-1 9a4168bd3b is in history

Change-Id: Ice3af5e3bcbbeb2c84e188f74c5e1ae59b3501ee
2020-04-01 01:41:25 +00:00
Cody Kesting
52e4e04842 [automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 9c341963ac am: 9b73d9dee0 -s ours
am skip reason: Change-Id Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694 with SHA-1 ec5a0cb0ff is in history

Change-Id: I3c4c90fa43ac063c5c10e5d0e5156b9cc53c3759
2020-04-01 01:41:22 +00:00
Chalard Jean
a705b0d8e3 [automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 0d667c5508 am: 4f37a69550 -s ours
am skip reason: Change-Id I803bdec80e27ee80d3a39844c5fb7aed584ab07d with SHA-1 20e92eca29 is in history

Change-Id: Ia706cfbcea4f390417a5af91a435e3f031e04b0c
2020-04-01 01:41:19 +00:00
Cody Kesting
cb2f2dcab4 [automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in CS. am: b65e18e638 am: 184d5e8dd0 -s ours
am skip reason: Change-Id Ib99e68d5ae47fa27e12428f9a60a2c1204ac59a2 with SHA-1 31f1ff693b is in history

Change-Id: I8f05b2bc6914fac024513c455ed800ce5578f494
2020-04-01 01:41:17 +00:00
Cody Kesting
517a3f3e28 [automerger skipped] Decrement networkRequestPerUid when callbacks are unregistered. am: aebda983d3 am: 10e11764d5 -s ours
am skip reason: Change-Id Ia5ed39c1d8e6221cd402be4f8baf69fa643a6113 with SHA-1 46cb167e08 is in history

Change-Id: I769105b5f30a741e70a7a46d593d2d48905d620f
2020-04-01 01:41:15 +00:00
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
5e543c05ed Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: bb578182f3
Change-Id: Id83214bd033f56295868f7c54a659a4d4b84fe79
2020-04-01 01:33:46 +00:00
Cody Kesting
f164a670c8 Simplify unregister logic for Connectivity Diagnostics callbacks. am: 5d51a917f5
Change-Id: I6b9541fd562c3e65af65e9b5b754909d96f332fd
2020-04-01 01:33:42 +00:00
Cody Kesting
006ad761b3 Clarify comments for Connectivity Diagnostics reports. am: 7d4ef21010
Change-Id: I9263ddeb7b757e6c147fcf57b5fd9825f2fd3860
2020-04-01 01:33:40 +00:00
Cody Kesting
9b73d9dee0 Sort administrator UIDs for NetworkCapabilities. am: 9c341963ac
Change-Id: I06d79c338f9994988373f43ab67efc1315596e5c
2020-04-01 01:33:36 +00:00
Chalard Jean
4f37a69550 Add combine() and equals() for NetworkCapabilities admin UIDs. am: 0d667c5508
Change-Id: I4b52b619cde3b080bfe58f69dacdb0078a11a7e8
2020-04-01 01:33:30 +00:00
Cody Kesting
184d5e8dd0 Use IBinder as key for ConnectivityDiagnostics storage in CS. am: b65e18e638
Change-Id: I9b75e908b217cf518281e1d8471af66022c65667
2020-04-01 01:33:24 +00:00
Cody Kesting
10e11764d5 Decrement networkRequestPerUid when callbacks are unregistered. am: aebda983d3
Change-Id: I8710a66725a0d09ca652ad8ce6fc7ced0070f647
2020-04-01 01:33:22 +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