Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Merge "Allow testing of signal strength" am: 089f46b079 am: cf0f5e8be4
Change-Id: Ib00611c70d9b8fc3e4ee5338980344f5e2167fa1

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-04-13 17:50:19 +00:00
69cdef2be4
Merge "Add instrumentation to test NetworkAgent." am: 1afe9973c1 am: cf21bc1551
Change-Id: Ief4f6bd95ba513e08c5d2e9e8fef9d0c426b4478

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-04-13 15:22:45 +00:00
36b78053aa
Allow testing of signal strength
- Let any process with NETWORK_SETTINGS register for signal strength
  wakeup.
- Allow agents registering test networks to assign them a signal
  strength.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: I2b4b89be3e69f4853fd6978d2c8f5c8eb4271f21

Chalard Jean   commited 2020-04-13 21:55:32 +09:00
cbc7c5b171
Add instrumentation to test NetworkAgent.
Test: NetworkAgentTest, new tests using this API
Bug: 139268426
Change-Id: Ia83b1c896df63bb18e2aa4b74d6cc09eba990eb5

Chalard Jean   commited 2020-04-13 15:44:07 +09:00
2116068514
Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-04-10 17:08:04 +00:00
c53b4498be
Fix a theoretical NPE
Test: NetworkAgentTests
Bug: 153718627
Change-Id: I08f57cce0cd85d5cd66e9a0ef948224290e9200e

Chalard Jean   commited 2020-04-10 23:08:00 +09:00
5d8bc4b1ac
Merge "Fix a stupid NPE" am: 30673a9684 am: fb3e94c8d8
Change-Id: I68e5702008a82d93c634fd45c2bd83a33fdf0cd2

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-04-07 06:18:28 +00:00
2e99fd04fe
Merge "Fix a stupid NPE"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-04-07 05:53:10 +00:00
30673a9684
Merge "Fix a bug where the legacy extra info is reset on connect." am: c0863db980 am: 7eebe72420
Change-Id: I127bf621caa39a24265f30cd4c781248410e5348

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-04-06 06:34:09 +00:00
4acb8ab295
Fix a bug where the legacy extra info is reset on connect.
Bug: 149459996
Test: NetworkAgentTest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I5f8f6d962ee3317e101d19518c767b3c327c0c47

Chalard Jean   commited 2020-04-06 12:46:19 +09:00
8e43611e05
Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e
Change-Id: I4d43b28d25529d4dd9e4304c4edf95edb5c5110b

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-04-03 05:07:20 +00:00
eb1f326acc
Added a new capability for temporarily unmetered network.
Added a new network capability TEMOPORARILY_NOT_METERED to support
the case that a network can temporarily become unmetered. This
allows carriers to deploy unmetered 5G network. When devices
camp on 5G network, this capability will be dynamically added
to the network and will be removed once leaving 5G coverage.

Bug: 153081494
Test: Manual
Change-Id: I10e26cb0852e67f614e7b9c4e49f95e078602e21

Jack Yu   commited 2020-04-02 19:28:41 -07:00
2bd176d185
Fix a stupid NPE
Okay so this is really not a behavior change as it converts an
NPE into an illegal argument exception, but still, that's what
should happen (and that's what the upcoming test actually tests
for).

Test: upcoming NetworkAgentTest
Bug: 139268426
Change-Id: I3e17211c03bc74426bf5e2e414ec322d73b0060b

Chalard Jean   commited 2020-04-03 07:17:13 +09:00
c7e1877d1c
Merge changes from topics "api-fix-networkagent", "satisfiedby"
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.

Chalard Jean   authored and   Gerrit Code Review   commited 2020-04-02 05:51:02 +00:00
2e64ca57b8
Merge "Only apply VPN isolation if it's fully routed" am: f198a43744 am: b9cd996758
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-04-02 04:50:41 +00:00
8e52c6d4be
Merge "Only apply VPN isolation if it's fully routed"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2020-04-02 04:10:12 +00:00
f198a43744
Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
Merged-In: I076876a6662bde143ef7d315ce3767acafff93c1

Chalard Jean   authored and   Aaron Huang   commited 2020-04-01 20:38:30 +08:00
82acfd29a1
Only apply VPN isolation if it's fully routed
VPN is considered fully routed if both IPv4 and IPv6 have
either a default route or a prohibit route.

Bug: 145332510
Test: atest FrameworksNetTests
Change-Id: I59cf48552bca98092d1212e3d718fd420add5458

Rubin Xu   commited 2020-04-01 09:36:29 +01:00
fa429013a0
Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Copy from ag/10866511
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
Merged-In: I8a785ae0e74e659c317deaaa28c203356c7766ed

Chalard Jean   authored and   Aaron Huang   commited 2020-04-01 16:01:04 +08:00
ef902503aa
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

Aaron Huang   authored and   Gerrit Code Review   commited 2020-04-01 05:33:28 +00:00
e6d2e6c4ac
Merge "Clarify comments for Connectivity Diagnostics reports." am: 71016c103f am: 0dcfdb77be
Change-Id: I4e6452b4875a8c3e3739dea4d3bc281a006156eb

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 18:17:26 +00:00
6a974a86c4
Merge "Sort administrator UIDs for NetworkCapabilities." am: 92e4bb4455 am: c475e2912b
Change-Id: I453f81bcb7c426ab4b529acce5c32c502a29331b

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 18:17:14 +00:00
0b68045244
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs." am: 1bf4b1f47b am: cfd382a47c
Change-Id: Ic8fc22f0eb47836053fc6b9423018c16ae46ef46

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 18:16:18 +00:00
3e23762597
Merge "Clarify comments for Connectivity Diagnostics reports."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-31 17:43:44 +00:00
71016c103f
Merge "Sort administrator UIDs for NetworkCapabilities."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-31 17:43:02 +00:00
92e4bb4455
Merge "Add combine() and equals() for NetworkCapabilities admin UIDs."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-31 17:42:18 +00:00
1bf4b1f47b
Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826397
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302
Merged-In: I6b086572cfc72a0727f4510351cff0e74cbc4302

Chalard Jean   authored and   Aaron Huang   commited 2020-03-31 11:57:59 +00:00
12fe284e0c
Update NetworkAgentConfig API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10826396
Change-Id: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
Merged-In: Idca9f243a5c955f4caa30921ee520e1a93b0d11a

Chalard Jean   authored and   Aaron Huang   commited 2020-03-31 11:51:05 +00:00
e5b9e82f86
Update the NetworkAgent API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Copy from ag/10824609
Change-Id: I9a2691f783f4449348c3f767568e05620f0b9df5
Merged-In: I9a2691f783f4449348c3f767568e05620f0b9df5

Chalard Jean   authored and   Aaron Huang   commited 2020-03-31 11:34:42 +00:00
7fe99f5dfe
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: 77f2293b06 am: c3a02d033f
Change-Id: Ib65d67f8d9a6e44d03f745cdcb27d7535fd40c58

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 00:54:30 +00:00
5c72dc9cd1
Clarify comments for Connectivity Diagnostics reports.
Clarify when
ConnectivityDiagnosticsCallback#onConnectivityReportAvailable will be
invoked. Clarify when NetworkAgentInfo#mConnectivityReport will be null
vs non-null.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I748bd9ded72a34d89f13bd4362d6d4da62b910b8
Merged-In: I748bd9ded72a34d89f13bd4362d6d4da62b910b8
(cherry picked from commit 604dd40cf077f42c2d4b6ff80ff41d89cfbcacee)

Cody Kesting   commited 2020-03-30 17:14:56 -07:00
96622a7cf5
Sort administrator UIDs for NetworkCapabilities.
Administrator UIDs stored in NetworkCapabilities should be sorted. This
allows for easier equals checks and hashCode computation. Additionally,
duplicate UIDs should be prevented.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694
Merged-In: Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694
(cherry picked from commit 2091bd9059d1d24f8c6bd1cd345361f185cab1ea)

Cody Kesting   commited 2020-03-30 17:14:44 -07:00
28743e99d5
Add combine() and equals() for NetworkCapabilities admin UIDs.
NetworkCapabilities#mAdministratorUids should be checked for equality
when combining NetworkCapabilities. Administrator UIDs should also be
included in NetworkCapabilities equals() and hashCode().

Bug: 147903575
Test: FrameworksNetTests
Change-Id: I803bdec80e27ee80d3a39844c5fb7aed584ab07d
Merged-In: I803bdec80e27ee80d3a39844c5fb7aed584ab07d
(cherry picked from commit 5fad8aa761336012bb228afc3b6f7d42fa274242)

Chalard Jean   authored and   Cody Kesting   commited 2020-03-30 17:14:33 -07:00
57f00777b3
Invoke onConnectivityReport on registering ConnectivityDiagnostics.
This change updates the behavior for registering
ConnectivityDiagnosticsCallbacks. Now, after a successful register()
call, callbacks will receive cached ConnectivityReports for all
matching, permissioned networks. This allows registrants to be updated
with the network state for their networks without having to wait for the
next network validation.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I924ba8fdcc847f453557021591bde38602fe089c
Merged-In: I924ba8fdcc847f453557021591bde38602fe089c
(cherry picked from commit 95ec0b206b759e1d26bc1dbb2255a515bb24358a)

Cody Kesting   commited 2020-03-30 17:13:55 -07:00
1bee2ea867
Clean up handling of NetworkCapabilities#administratorUids.
Update ConnectivityService's check for administrator UIDs to use
ArrayUtils to check for UID inclusion. Update the NetworkCapabilities
annotation on the administrator UIDs field to clarify that it is
NonNull.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
Merged-In: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
(cherry picked from commit 898496365aa1f3601cdbb305004ad0de11ff6bfc)

Cody Kesting   commited 2020-03-30 17:13:37 -07:00
5a4b20d623
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-31 00:06:26 +00:00
77f2293b06
Merge "Clean up handling of NetworkCapabilities#administratorUids." am: 7ac175925c am: d30159678b
Change-Id: Ie2e85fc61fe3765beebcc511f2256bd6b4c37b1f

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-30 22:50:39 +00:00
c82bde604a
Merge "Clean up handling of NetworkCapabilities#administratorUids."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-30 22:04:43 +00:00
7ac175925c
Clarify comments for Connectivity Diagnostics reports.
Clarify when
ConnectivityDiagnosticsCallback#onConnectivityReportAvailable will be
invoked. Clarify when NetworkAgentInfo#mConnectivityReport will be null
vs non-null.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I748bd9ded72a34d89f13bd4362d6d4da62b910b8

Cody Kesting   commited 2020-03-30 14:51:24 -07:00
782d0a044c
Sort administrator UIDs for NetworkCapabilities.
Administrator UIDs stored in NetworkCapabilities should be sorted. This
allows for easier equals checks and hashCode computation. Additionally,
duplicate UIDs should be prevented.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694

Cody Kesting   commited 2020-03-30 14:51:24 -07:00
751d414caf
Add combine() and equals() for NetworkCapabilities admin UIDs.
NetworkCapabilities#mAdministratorUids should be checked for equality
when combining NetworkCapabilities. Administrator UIDs should also be
included in NetworkCapabilities equals() and hashCode().

Bug: 147903575
Test: FrameworksNetTests
Change-Id: I803bdec80e27ee80d3a39844c5fb7aed584ab07d

Chalard Jean   authored and   Cody Kesting   commited 2020-03-30 14:27:20 -07:00
9e70d0d85f
Invoke onConnectivityReport on registering ConnectivityDiagnostics.
This change updates the behavior for registering
ConnectivityDiagnosticsCallbacks. Now, after a successful register()
call, callbacks will receive cached ConnectivityReports for all
matching, permissioned networks. This allows registrants to be updated
with the network state for their networks without having to wait for the
next network validation.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I924ba8fdcc847f453557021591bde38602fe089c

Cody Kesting   commited 2020-03-30 11:10:46 -07:00
905b475a00
Clean up handling of NetworkCapabilities#administratorUids.
Update ConnectivityService's check for administrator UIDs to use
ArrayUtils to check for UID inclusion. Update the NetworkCapabilities
annotation on the administrator UIDs field to clarify that it is
NonNull.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3

Cody Kesting   commited 2020-03-30 16:55:21 +00:00
61c6b86550
Merge "Create a builder for NetworkCapabilities."
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-03-30 02:58:45 +00:00
9259da76fb
Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: f7c2921f91
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-03-27 22:56:26 +00:00
962be5ead0
Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1

Chalard Jean   commited 2020-03-27 23:46:30 +09:00
e693268f50
Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed

Chalard Jean   commited 2020-03-27 17:57:24 +09:00
c882f64b3c
Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302

Chalard Jean   commited 2020-03-27 17:53:05 +09:00
4c7368a340
Merge "API review: access field by method"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-27 07:03:25 +00:00
1c556c813c
Merge changes from topic "networkagent_api" into rvc-dev am: 6d25213263
Change-Id: If16fd956e2d694fa36492cc1a1512a9d12dee3dd

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-03-27 06:23:56 +00:00
c03489e3fa