Aaron Huang
03372ab214
Merge "Add getters to UnderlyingNetworkInfo" into sc-dev
2021-04-22 03:09:41 +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
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
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
Treehugger Robot
da2dfee6d5
Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905
Change-Id: I100470cc936fca8dba86a1ad083d4d67139b6aea
2021-04-20 09:06:31 +00:00
Remi NGUYEN VAN
8cb7d32b1a
Update TEST_MAPPING imports for connectivity
...
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.
Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
2021-04-20 07:10:41 +00:00
Remi NGUYEN VAN
96dc675760
Roll forward: add a test for ParseException
...
The test simply creates an exception and verifies that it has the
required fields.
The constructor tests are only run on S+ as they are not part of the
API before that.
Change-Id: Ic30a34d3203c1b40923ba783a34f0cfed53a07ae
Test: atest FrameworksNetTests
2021-04-20 16:04:33 +09:00
Remi NGUYEN VAN
7696391a92
Revert "Add a test for ParseException"
...
This reverts commit 98bab00fc9 .
Reason for revert: Test broken on R: b/185751610
Change-Id: I9f5d25c0ba81011848ab3cf7ec44aa329fbb3b0f
2021-04-20 16:04:33 +09:00
markchien
bcce2a5d52
Change Connectivity resources SDK version to 30
...
S tethering module fail to sideload in R platform because package
manager fail to parse S version sdk in R platform.
Bug: 182409819
Test: m
Change-Id: I35c63e4bfe7657afe1e7364926ab139b042b403e
Merged-In: I35c63e4bfe7657afe1e7364926ab139b042b403e
2021-04-20 06:21:04 +00:00
markchien
20a8e9413f
Change Connectivity resources SDK version to 30
...
S tethering module fail to sideload in R platform because package
manager fail to parse S version sdk in R platform.
Bug: 182409819
Test: m
Change-Id: I35c63e4bfe7657afe1e7364926ab139b042b403e
2021-04-20 14:19:01 +08:00
Aaron Huang
9a2db307ba
Add getters to UnderlyingNetworkInfo
...
Address API review feedback, add getters to UnderlyingNetworkInfo
instead of exposing fields.
Instead of wasting memory by converting this into an array, have
migrateTun take a List<String>. In turn, tunAdjustmentInit should
also take a List<String>.
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
2021-04-20 13:34:52 +08:00
James Mattis
fff0b7ce6d
Correctly count nri uid request counts
...
Correctly count nri uid request counts in the per-app functionality in
connectivity currently used by set profile and set oem network
preference APIs. Previously, upon creation, nris would be created prior
to removing them. This would cause the uid request counts to
artificially increase and incorrectly throw an error if the request
count limit was hit even though in actuality an apps request count was
valid.
E.g., if there was an existing request for per-app functionality and
its owning app made a change to the per-app requests, it would double
count the existing requests. If the current count was say, one under the
limit, an error would be thrown even though it was being replaced which
should have resulted in no net change to the request count limit if
working correctly.
This patch will allow for the requests to be removed prior to creation
so that request counts are tabulated correctly.
Bug: 185849563
Bug: 183785319
Test: atest FrameworksNetTests
Change-Id: I13da0c81256cc02bea6aff2fe1ef99d6f6b0e764
2021-04-19 19:28:23 -07:00
Nazanin
8d18299e28
Refactoring and mocking to make sure unit test doesn't call the real service
...
Bug: 180938364
Test: utest
Change-Id: Ic6a5a84c1d985fa02f8cf52c8c2ff144669b30c1
2021-04-19 17:12:05 -07:00
Aaron Huang
b4f36cd5f8
Merge "Rename getAllNetworkStateSnapshot which should be pluralized" into sc-dev
2021-04-19 16:42:58 +00:00
Chiachang Wang
a5b7b9cfd8
Merge "Update the permission check for dump" am: 8df8f29f8b am: 1e46f3f547 am: 2f059d6005
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678985
Change-Id: Ie43488b368a8bae1c75b4228f2214dd540a9b8f7
2021-04-19 06:20:15 +00:00
Remi NGUYEN VAN
8917ed4069
Merge "Add a test for ParseException" am: dfb51531e6 am: 3a21c84b20 am: e3f7c9ef21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675625
Change-Id: I303ef3cdfaddf6b7a4aea661dbbceb7ab8d3eeca
2021-04-19 06:19:46 +00:00
Chiachang Wang
2f059d6005
Merge "Update the permission check for dump" am: 8df8f29f8b am: 1e46f3f547
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678985
Change-Id: Id4c40e177621f39174cd4cf6cd39cc40033302b8
2021-04-19 06:18:01 +00:00
Chiachang Wang
1e46f3f547
Merge "Update the permission check for dump" am: 8df8f29f8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678985
Change-Id: I48703e74bea2a878ded3850dc5be6ec12e5c8e87
2021-04-19 05:52:38 +00:00
Remi NGUYEN VAN
e3f7c9ef21
Merge "Add a test for ParseException" am: dfb51531e6 am: 3a21c84b20
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675625
Change-Id: I17a061ba6395b03250bca4162efe2d439113e1e6
2021-04-19 05:42:08 +00:00