Commit Graph

14717 Commits

Author SHA1 Message Date
James Mattis
268f2cd458 Updating tests to honor per-app TRACK_DEFAULT
Per-app APIs in ConnectivityService will now have their fallback
request which tracks the system default be of type TRACK_DEFAULT
as opposed to REQUEST. Existing tests which expect this fallback request
to be sent to network factories need to be updated to validate this
change.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
Change-Id: I5125755b3ed1ec535494e2d7a48c0860710ed056
2021-04-22 17:41:47 -07:00
James Mattis
6402e58bc3 Changing per-app default request to TRACK_DEFAULT
Changing the per-app default request flows to fallback to a request of
type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this
change is that these requests will no longer be sent to the factories
which is desired.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
2021-04-22 07:26:10 -07:00
Chalard Jean
e18832887c Merge "Enable policy ranking" into sc-dev 2021-04-22 13:24:32 +00:00
Remi NGUYEN VAN
037f39e18e Merge "Fix netId testing on Q and R" into sc-dev 2021-04-22 09:56:52 +00:00
Treehugger Robot
bf5625913d [automerger skipped] Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 4995a0bbaa am: 8200dbed1d am: dbd9708528 -s ours
am skip reason: skip tag Change-Id I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 with SHA-1 58153cc4c4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629

Change-Id: I9be0b8d219ff67948ed19a45d60381ba69c963df
2021-04-22 05:47:34 +00:00
Remi NGUYEN VAN
5ce07b2098 Fix netId testing on Q and R
Do not call getNetId() on Q as it did not exist yet. Add a separate test
for getNetId(), only run after Q.

Also add testing for getNetIdForResolv and fromNetworkHandle on Q and R.

Bug: 185731396
Test: atest NetworkTest
Change-Id: I03f9eb0c94b09dc285018e9887fe20d95a93ae45
2021-04-22 14:38:51 +09:00
Treehugger Robot
dbd9708528 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 4995a0bbaa am: 8200dbed1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629

Change-Id: I0292c32f0c0140213aa12309032421a18105bf02
2021-04-22 05:22:10 +00:00
Treehugger Robot
8200dbed1d Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 4995a0bbaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629

Change-Id: Iccc7fe3e625083ee60a54d0e3719d1c8b2458a72
2021-04-22 05:03:42 +00:00
Treehugger Robot
4995a0bbaa Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Lorenzo Colitti
38be07bc7d Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 82efa81cd7 am: d782bc08d0 am: 81ba9c4510
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: If0d8f99d618173d707d2f473d4f6634c3461f0ca
2021-04-22 03:29:41 +00:00
Lorenzo Colitti
81ba9c4510 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 82efa81cd7 am: d782bc08d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: Iab86e5ecf719ddec0030b343dca9c2586a2cb8ef
2021-04-22 03:27:44 +00:00
Aaron Huang
03372ab214 Merge "Add getters to UnderlyingNetworkInfo" into sc-dev 2021-04-22 03:09:41 +00:00
Lorenzo Colitti
d782bc08d0 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 82efa81cd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: Ic098dc012380be363d7acb088dab34343dd250e0
2021-04-22 03:01:56 +00:00
Lorenzo Colitti
82efa81cd7 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." 2021-04-22 02:36:11 +00:00
Treehugger Robot
6a28f1cf90 Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439 am: d6d2cfa107 am: 053dfc191d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: I6ecdb60e530807c8a93f2709784cf1b5814a2178
2021-04-21 15:21:59 +00:00
Treehugger Robot
053dfc191d Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439 am: d6d2cfa107
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: Ib6a1b690c32b25aa86d8d432ac3f3a9eb1803efa
2021-04-21 14:57:42 +00:00
Treehugger Robot
d6d2cfa107 Merge "Do not deduce VCN capability if Builder is derived from request" am: b808656439
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683015

Change-Id: I19da4ae952b5d412b429aa291868e8e7980ad5fd
2021-04-21 14:29:33 +00:00
Treehugger Robot
b808656439 Merge "Do not deduce VCN capability if Builder is derived from request" 2021-04-21 14:06:14 +00:00
Aaron Huang
1d3726a35e Merge "Add getters to NetworkStateSnapshot" into sc-dev 2021-04-21 11:20:10 +00:00
Chalard Jean
5b5731cfb1 Enable policy ranking
Test: Passes all presubmits, been tested in labs
Bug: 184834350
Change-Id: If33884aa245bcc8817bbc9c2fdfab035249e7301
2021-04-21 11:16:44 +00:00
junyulai
be1c5ddd2f Do not deduce VCN capability if Builder is derived from request
If the caller constructed the builder from a request, it means
the user might explicitly want the capabilities from the request.
Thus, the NOT_VCN_MANAGED capabilities should not be touched
later.

Test: TH
Fix: 185876442
Change-Id: I92037cc8547fb72de12d6b6402f060f6c98e1853
2021-04-21 19:10:28 +08:00
Treehugger Robot
ab620764d7 Merge "Add the related extra information in the javadoc" am: fccaf80eba am: e38830b5a1 am: c3286a8cc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: I9eb3c2543787a91f211be5eb7b92b66fe696489f
2021-04-21 09:19:13 +00:00
Treehugger Robot
646bed7924 [automerger skipped] Merge "Change Connectivity resources SDK version to 30" am: 742164747b am: 610cb04212 am: 58c1aa3f1e -s ours
am skip reason: skip tag Change-Id I35c63e4bfe7657afe1e7364926ab139b042b403e with SHA-1 20a8e9413f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749

Change-Id: I09477ef4873bab9cb8b319a341502fc7f8fbec0f
2021-04-21 09:18:56 +00:00
Treehugger Robot
c3286a8cc6 Merge "Add the related extra information in the javadoc" am: fccaf80eba am: e38830b5a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: Ia2c8d547ec240b828925a98bf2e43291ababebca
2021-04-21 08:53:50 +00:00
Treehugger Robot
58c1aa3f1e Merge "Change Connectivity resources SDK version to 30" am: 742164747b am: 610cb04212
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749

Change-Id: I603b13d9a9db97d83591ef8e41fe68c02cb3e96a
2021-04-21 08:53:27 +00:00
Treehugger Robot
e38830b5a1 Merge "Add the related extra information in the javadoc" am: fccaf80eba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681465

Change-Id: I6ea797209d4d4118ffd28acba4dd419f56d90536
2021-04-21 08:28:23 +00:00
Treehugger Robot
610cb04212 Merge "Change Connectivity resources SDK version to 30" am: 742164747b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679749

Change-Id: I0ef9286794a6013b50fb1dfd0b59d35a5ae55c20
2021-04-21 08:25:39 +00:00
Treehugger Robot
fccaf80eba Merge "Add the related extra information in the javadoc" 2021-04-21 08:22:43 +00:00
Treehugger Robot
742164747b Merge "Change Connectivity resources SDK version to 30" 2021-04-21 08:00:41 +00:00
Sudheer Shanka
b9c396eef9 Hide NetworkPolicyManager.blockedReasonsToString API.
BLOCKED_REASON_* constants have been moved to ConnectivityManager
and blockedReasonsToString() util method doesn't belong in
NetworkPolicyManager as an API. So, just removing it for now.

Bug: 185967486
Test: treehugger
Change-Id: Ie04044980fdfc7ec772444be13fc659880953bd1
2021-04-21 07:23:54 +00:00
James Mattis
5e6b7f9aa2 Merge "Correctly count nri uid request counts" am: 5ab962df61 am: b039be7617 am: d2c14296e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051

Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13
2021-04-21 03:17:13 +00:00
James Mattis
d2c14296e4 Merge "Correctly count nri uid request counts" am: 5ab962df61 am: b039be7617
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051

Change-Id: If4ff10a4793cee3a00aa1d66bf85af19f9e88b72
2021-04-21 02:52:41 +00:00
lucaslin
8a8cb5d4ab Add the related extra information in the javadoc
Bug: 185876442
Test: make docs
Change-Id: Ib0abc43e2009dbf5ee7b6c2a076424834d3d53f2
2021-04-21 10:43:15 +08:00
James Mattis
b039be7617 Merge "Correctly count nri uid request counts" am: 5ab962df61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051

Change-Id: I5ab86516030c8758b77c7335da68fd4f01b34a60
2021-04-21 02:23:29 +00:00
James Mattis
5ab962df61 Merge "Correctly count nri uid request counts" 2021-04-21 02:06:33 +00:00
Nazanin Bakhshi
e7897d5495 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" am: 348f5cb01e am: 3779168261 am: deab38d5bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228

Change-Id: I92c9fc5f4dcfc0a7f80db78b885945a1021eab20
2021-04-20 17:13:46 +00:00
Nazanin Bakhshi
deab38d5bb Merge "Refactoring and mocking to make sure unit test doesn't call the real service" am: 348f5cb01e am: 3779168261
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228

Change-Id: I1a398667cc0a51d0454fb956be8f08871c23af6e
2021-04-20 16:50:40 +00:00
Nazanin Bakhshi
3779168261 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" am: 348f5cb01e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228

Change-Id: Iaaa8635c0c1031f6b7e896c879de9744a1215f54
2021-04-20 16:27:56 +00:00
Nazanin Bakhshi
348f5cb01e Merge "Refactoring and mocking to make sure unit test doesn't call the real service" 2021-04-20 15:44:00 +00:00
Aaron Huang
c8081e954e Add getters to NetworkStateSnapshot
Address API council feedback, add getters to NetworkStateSnapshot
instead of exposing the bare fields directly.

Bug: 183972826
Test: FrameworksNetTests
Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
2021-04-20 21:55:56 +08:00
Treehugger Robot
071a02f92e Merge "Roll forward: add a test for ParseException" am: 55b86dd028 am: 90d389d11f am: 71c81897d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759

Change-Id: I7b1b1be4fa5bcda94b653dffbc99db65384079ad
2021-04-20 13:12:32 +00:00
Remi NGUYEN VAN
934e933056 Merge "Revert "Add a test for ParseException"" am: 060026feca am: 2d467a1678 am: 3116f6f958
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758

Change-Id: I9257db040086870412833e8cfb14596f6ac17288
2021-04-20 13:12:01 +00:00
Treehugger Robot
ed8602bbde Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b am: da2dfee6d5 am: 39b23dc413
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905

Change-Id: I1acd627f5316b88739c1d10fb5c788751d62938e
2021-04-20 13:10:22 +00:00
Treehugger Robot
71c81897d6 Merge "Roll forward: add a test for ParseException" am: 55b86dd028 am: 90d389d11f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759

Change-Id: Ie86bf592435383da29eb8b53590d1e208ffd0a2b
2021-04-20 10:22:40 +00:00
Remi NGUYEN VAN
3116f6f958 Merge "Revert "Add a test for ParseException"" am: 060026feca am: 2d467a1678
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758

Change-Id: Ib586e908b31ccb2c2054ec99ae1be2dea4d39988
2021-04-20 10:22:30 +00:00
Treehugger Robot
90d389d11f Merge "Roll forward: add a test for ParseException" am: 55b86dd028
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679759

Change-Id: I17938abef561d95347869084114ee08f90d81db5
2021-04-20 10:13:47 +00:00
Treehugger Robot
55b86dd028 Merge "Roll forward: add a test for ParseException" 2021-04-20 10:03:56 +00:00
Remi NGUYEN VAN
2d467a1678 Merge "Revert "Add a test for ParseException"" am: 060026feca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679758

Change-Id: Ifb852d9264a6e1fc5ce82a5eb35d66459a021599
2021-04-20 09:52:35 +00:00
Treehugger Robot
39b23dc413 Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b am: da2dfee6d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905

Change-Id: I0d5d0be2d59eca6447419a92039be82a0769a5b4
2021-04-20 09:31:43 +00:00
Remi NGUYEN VAN
060026feca Merge "Revert "Add a test for ParseException"" 2021-04-20 09:25:07 +00:00