Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Merge "Update javadoc to use complete sentence" am: d3068f93c3 am: bd1d9f134f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323953

Change-Id: I357ae71b7f86ed3560333a67a2444eb8bb93c71c

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-06-05 03:36:44 +00:00
6c4884bc12
Merge "Update javadoc to use complete sentence"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-06-05 03:02:36 +00:00
d3068f93c3
Merge "Update extra info before registering" am: 6f9c48b81e am: d5420bf1f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1310538

Change-Id: I5e38601026c1f9d30fee58a40bfb1ad467f41e35

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-06-05 00:41:42 +00:00
57e93bef72
Update javadoc to use complete sentence
Avoid using the "iff" abbreviation in our Javadoc.

Bug: 158092978
Test: m doc-comment-check-docs and check the generated doc
Change-Id: I41bf8a6ddad200f00524d9b2dd1bf169810ee460

Chiachang Wang   commited 2020-06-04 07:46:14 +00:00
8b60559b7e
Update extra info before registering
The extra info is taken into NetworkMonitor from while creating
it. The NetworkMonitor is created when a new agent is registered
but the extra info is not available at that time. Make sure the
field is set in the NetworkInfo when registering.

Bug: 156173829
Test: adb shell dumpsys network and check the apn in the extra
      info shown correctly
Test: atest FrameworkNetTests
Change-Id: Ieaad8cbf1a28af3b97c7f98f74358e417fcad661

Chiachang Wang   commited 2020-06-03 13:01:01 +08:00
9774ceb3ea
Merge "Allow TRANSPORT_TEST ethernet networks" am: 6642ec61c3 am: 54c3c2b3c7
Change-Id: I030f0aeb0f196fee213fee02a25c5a7e66618b93

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2020-05-29 22:09:13 +00:00
b9bd905c0b
Allow TRANSPORT_TEST ethernet networks
Ethernet networks using tap interfaces should have TRANSPORT_TEST so
they are not considered by network selection.

Test: atest CaptivePortalApiTest FrameworksNetTests
Bug: 156319532
Change-Id: I0d9477977c88aa055625ab4046577a41e76b05ff

Remi NGUYEN VAN   commited 2020-05-29 10:22:50 +09:00
656c566cf1
Merge "Forward unknown Data Stall types to Connectivity Diagnostics." am: b10df0da89 am: 8c5375cec3
Change-Id: I31d17c5c353e822f3d48166ffe9cc39abd31c198

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-05-21 23:35:38 +00:00
1dc1ba0bb0
Forward unknown Data Stall types to Connectivity Diagnostics.
This CL forwards suspected Data Stall events detected with unknown
detection methods to ConnectivityDiagnostics.

Currently, ConnectivityService drops any data stall events with unknown
detection methods, which leads to false negatives for Connectivity
Diagnostics registrants. This change ensures that registrants will still
be notified as NetworkStack is updated to use new detection methods.

The documentation for ConnectivityDiagnosticsManager#DataStallReport is
also updated to reflect that the detection methods included in the
report are a bit mask of detection methods used. Implicitly, this means
that data stalls detected via unknown methods will have an empty bit
mask (0x00).

Bug: 156294356
Test: atest ConnectivityDiagnosticsManager
Change-Id: I62d0bf91fcc17c7921afd519c72551399906bd6b

Cody Kesting   commited 2020-05-19 10:57:29 -07:00
b37958eec9
Merge "Create TestApi for simulating a Data Stall on ConnectivityService." am: e743a30aa7 am: b36fa34041
Change-Id: I17839cd271d984f76c203889293cc51375bb8bcb

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-05-12 17:27:09 +00:00
f42a04447b
Merge "Set owner and administrator UIDs for test networks." am: 2ba1b8ecd1 am: f9877d902e
Change-Id: I7af702ff5eafbd0f5bb2247e0debf975e51accd1

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-05-12 17:26:44 +00:00
801b5b9ea3
Merge "Create TestApi for simulating a Data Stall on ConnectivityService."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-05-12 16:52:35 +00:00
e743a30aa7
Merge "Set owner and administrator UIDs for test networks."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-05-12 16:52:07 +00:00
2ba1b8ecd1
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
Merged-In: I10e26cb0852e67f614e7b9c4e49f95e078602e21

Jack Yu   authored and   Sarah Chin   commited 2020-05-06 13:13:45 -07:00
0298306ba0
Create TestApi for simulating a Data Stall on ConnectivityService.
This change adds a TestApi for simulating a Data Stall to
ConnectivityService. This allows for Data Stalls to be triggered without
having to manipulate the signals used by NetworkMonitor . This also
allows NetworkMonitor to update the ways it detects Data Stalls without
affecting CTS tests for ConnectivityDiagnosticsManager.

Bug: 148032944
Test: atest ConnectivityDiagnosticsManagerTest
Change-Id: Icad439efa2ab4c872c21d3ee6ceaae8c5b49f18d

Cody Kesting   commited 2020-04-27 20:55:00 -07:00
f53a075913
Set owner and administrator UIDs for test networks.
This change sets the owner and administrator UIDs for test networks when
their initial values match the UID for the app creating the test
network. This ensures that apps registering test networks can only make
themselves owners / administrators of the network.

Bug: 153449964
Test: atest NetworkAgentTest
Change-Id: I3a974700aa1d83cb285295ed1de0aa263e2e5b58

Cody Kesting   commited 2020-04-27 20:54:57 -07:00
fc7cad313d
Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: 7b3866f284
Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f

Philip P. Moltmann   authored and   Automerger Merge Worker   commited 2020-04-22 15:19:14 +00:00
84091e184a
Set attributionTag for noteOp(WRITE_SETTINGS) calls
Test: atest FrameworksNetTests TetheringTests:TetheringServiceTest
Bug: 136595429
Merged-In: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Change-Id: Ic3d937e7bb5141798234ed5b2852c1f768e97495

Philip P. Moltmann   commited 2020-04-20 18:00:03 -07:00
7bc33dfb89
Merge "Allow testing of signal strength" am: 836df36aee am: 926dbce337
Change-Id: Ib00611c70d9b8fc3e4ee5338980344f5e2167fa1

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-04-13 17:50:19 +00:00
9a14a06ae5
Merge "Add instrumentation to test NetworkAgent." am: eb1d6593c5 am: 6dcb6a943c
Change-Id: Ief4f6bd95ba513e08c5d2e9e8fef9d0c426b4478

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-04-13 15:22:45 +00:00
6edf06afb0
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
6b59b8fbcc
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
be9447be58
Merge "Fix a theoretical NPE" am: e21dccde6b am: 49021c2c68
Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193

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

Chalard Jean   commited 2020-04-10 23:08:00 +09:00
35a06972cc
Merge "Fix a stupid NPE" am: 16f4882784 am: b3f7f04518
Change-Id: I68e5702008a82d93c634fd45c2bd83a33fdf0cd2

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-04-07 06:18:28 +00:00
57e2a625f5
Merge "Fix a stupid NPE"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-04-07 05:53:10 +00:00
16f4882784
Merge "Fix a bug where the legacy extra info is reset on connect." am: 7e2d55206e am: 9f964ebc15
Change-Id: I127bf621caa39a24265f30cd4c781248410e5348

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-04-06 06:34:09 +00:00
a6e848328a
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
56c327341e
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
53e0564ca4
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
71863e9604
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
380318053b
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
9122e56202
Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282 am: d24e7fb5a1
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-04-02 04:50:41 +00:00
62d2333abd
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
5c5d1a1282
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
c62f9a53d8
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
ab8cf306ea
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
691a34d96b
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
f210e24871
Merge "Clarify comments for Connectivity Diagnostics reports." am: 87ce14f328 am: 1d99c7333f
Change-Id: I4e6452b4875a8c3e3739dea4d3bc281a006156eb

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 18:17:26 +00:00
84cfd6c6e4
Merge "Sort administrator UIDs for NetworkCapabilities." am: c350963548 am: 8d84479831
Change-Id: I453f81bcb7c426ab4b529acce5c32c502a29331b

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

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 18:16:18 +00:00
975c5c699a
Merge "Clarify comments for Connectivity Diagnostics reports."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-31 17:43:44 +00:00
87ce14f328
Merge "Sort administrator UIDs for NetworkCapabilities."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-31 17:43:02 +00:00
c350963548
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
e4df39ba4b
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
5f12f81206
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
aea539a13e
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
f5d1bfd77f
Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa am: 7439991aec
Change-Id: Ib65d67f8d9a6e44d03f745cdcb27d7535fd40c58

Cody Kesting   authored and   Automerger Merge Worker   commited 2020-03-31 00:54:30 +00:00
22f3171c07
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
7d4ef21010
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
9c341963ac