Commit Graph

14658 Commits

Author SHA1 Message Date
Chiachang Wang
2e98f6cd57 Address API review feedback
Address API review feedback to:
 - Rename NetworkAgent#setTeardownDelayMs to
   NetworkAgent#setTeardownDelayMillis
 - Use getters instead of fields in VpnTransportInfo
 - Rename registerDefaultNetworkCallbackAsUid to
   registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Test: atest FrameworksMockingServicesTests
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-20 09:30:59 +00: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
Chiachang Wang
8df8f29f8b Merge "Update the permission check for dump" 2021-04-19 05:37:09 +00:00
Remi NGUYEN VAN
3a21c84b20 Merge "Add a test for ParseException" am: dfb51531e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675625

Change-Id: I2ef380a3b4c2f0170c77baa11ca3cbcf10b21bed
2021-04-19 05:19:30 +00:00
Remi NGUYEN VAN
dfb51531e6 Merge "Add a test for ParseException" 2021-04-19 04:57:31 +00:00
Chiachang Wang
70348a2672 Update the permission check for dump
ServicePermissionsTest#testDumpProtected expects to see nothing
from dump() if the caller does not have the required permission.

After the refactor the ConnectivityService#dump(). It does not
leak real information for those callers without permission but
show the title of dumpsys, i.e. it shows "DUMP OF SERVICE HIGH
connectivity". This breaks the test since the test expects to
see nothing.

Move the permission check to the front of dump call stack since
there is no way to call other private dump related methods.

Bug: 185425662
Test: atest android.security.cts.ServicePermissionsTest
Test: adb shell dumpsys connectivity
Change-Id: I173c968a4f1c4d6f618ed87725a6ccda8d309988
2021-04-19 11:09:15 +08:00
Aaron Huang
20605e540a Rename getAllNetworkStateSnapshot which should be pluralized
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots

Bug: 183972554
Test: make, FrameworksNetTests
      FrameworksServicesTests
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-17 14:08:49 +08:00
Junyu Lai
e41512c1bd [automerger skipped] Merge "[VCN20] Change requestBackgroundNetwork argument order" am: bd7b4a4a65 am: 0e6e9b34a0 am: a0808bbac3 -s ours
am skip reason: skip tag Change-Id Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb with SHA-1 56ed9a3349 is already in history

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

Change-Id: Icd3d0fe11a9de3c98d55fb91e935dc537a28af48
2021-04-16 17:16:07 +00:00
Junyu Lai
a0808bbac3 Merge "[VCN20] Change requestBackgroundNetwork argument order" am: bd7b4a4a65 am: 0e6e9b34a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I2b4369cb4127f130076ced52ba020db99f617cd7
2021-04-16 16:52:07 +00:00
Junyu Lai
0e6e9b34a0 Merge "[VCN20] Change requestBackgroundNetwork argument order" am: bd7b4a4a65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I73df5528088176070af6e54e01358b1edec27b50
2021-04-16 16:25:55 +00:00
Junyu Lai
bd7b4a4a65 Merge "[VCN20] Change requestBackgroundNetwork argument order" 2021-04-16 16:04:31 +00:00
Junyu Lai
d175339d58 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev 2021-04-16 15:59:16 +00:00
TreeHugger Robot
6b6eabfea8 Merge "[NS13] Remove the last usage of the legacy int" into sc-dev 2021-04-16 11:09:37 +00:00
Chalard Jean
3d71e308e0 [NS13] Remove the last usage of the legacy int
Note that this requires removing part of a test, because
that part is testing that the a 50 bonus of the legacy
int is stronger than the validation penalty, which is
not a mechanic we want to have. When WiFi is unvalidated
and cell is unvalidated, cell should be kept in case it
validates, like is described in comments in
isNetworkPotentialSatisfier ; however this test is
checking that it *IS* reaped off if the wifi score is
strong enough. This should be incorrect, and should not
be tested, so this patch removes the check.

Test: ConnectivityServiceTest
Bug: 184834350
Change-Id: I8966abee59fea2d9f10f082aba87df6588b72762
2021-04-16 18:13:10 +09:00
Lorenzo Colitti
1a4fe368af Merge "Don't expose raw IBinder APIs." am: 6e535a1294 am: 5bc05685a3 am: 0b8438b700
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
2021-04-16 08:48:41 +00:00
Aaron Huang
0df7210cf4 Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac am: 0f2b3c67e7 am: 57a82edf0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I8460ed44fb1bc72a8533d2e57012ccc623f8ca73
2021-04-16 08:47:59 +00:00
Lorenzo Colitti
0b8438b700 Merge "Don't expose raw IBinder APIs." am: 6e535a1294 am: 5bc05685a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: I42ef2c83eefc6dc4967e71be82f48cca38d74f43
2021-04-16 08:13:03 +00:00
Aaron Huang
57a82edf0b Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac am: 0f2b3c67e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I2821348230f093569e8149779a88d31ce2b0b322
2021-04-16 08:12:18 +00:00
Lorenzo Colitti
5bc05685a3 Merge "Don't expose raw IBinder APIs." am: 6e535a1294
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic954df4bcbb444797d62077047cd74182ac06164
2021-04-16 07:42:57 +00:00
Aaron Huang
0f2b3c67e7 Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I30a02b57b58cbd3197faa614d036daec7ff06bd6
2021-04-16 07:29:00 +00:00
Lorenzo Colitti
6e535a1294 Merge "Don't expose raw IBinder APIs." 2021-04-16 07:22:13 +00:00
Aaron Huang
7b38530eac Merge "Handle null pointer cases in ConnectivityService" 2021-04-16 07:06:37 +00:00
Chiachang Wang
f7538615c1 Merge "Extend framework-connectivity.impl visibility" into sc-dev 2021-04-16 01:13:34 +00:00
junyulai
e576c085c3 [VCN20] Change requestBackgroundNetwork argument order
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Merged-In: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
  (cherry-picked from ag/14198667)
2021-04-16 00:16:21 +08:00
Aaron Huang
6a16a415d9 Handle null pointer cases in ConnectivityService
If a method is called by adb command "service call"
with no parameters. It will cause to crash because
of a null object reference.

Add a null check for them to avoid system server crash.

Bug: 172885426
Test: FrameworksNetTest
      adb shell service call connectivity #
Change-Id: I8748fc5c6a7a6e82db3581e3026a3f75909a357e
2021-04-16 00:15:25 +08:00
Junyu Lai
e3bad0320d Merge "[VCN20] Change requestBackgroundNetwork argument order" into sc-dev 2021-04-15 15:57:42 +00:00
Chiachang Wang
d6e6d52028 Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 am: d9f6d6e397 am: 965b73b955
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
2021-04-15 13:16:16 +00:00
Chiachang Wang
965b73b955 Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 am: d9f6d6e397
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
2021-04-15 12:46:41 +00:00
Chiachang Wang
d9f6d6e397 Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af
2021-04-15 11:53:02 +00:00
Chiachang Wang
7e1afe7650 Merge "Remove hidden method link in public addRoute API" 2021-04-15 11:26:41 +00:00
Treehugger Robot
2a80f49be8 Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e am: dc05bc9aa7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: Ib65cdc3ebbde42c2ba68880b2895b0bc3db5c022
2021-04-15 11:22:08 +00:00
Treehugger Robot
dc05bc9aa7 Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: I03024cb93ea05cccb7ec43a19c3430ef20637eeb
2021-04-15 10:54:23 +00:00
TreeHugger Robot
6318c5aef2 Merge "Add documentation" into sc-dev 2021-04-15 10:52:46 +00:00
junyulai
56ed9a3349 [VCN20] Change requestBackgroundNetwork argument order
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Ignore-AOSP-First: avoid build break caused by multipatch automerge
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
2021-04-15 18:43:48 +08:00
junyulai
58153cc4c4 [VCN19] Rename get/setSubIds to get/setSubscriptionIds
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Ignore-AOSP-First: avoid merge conflict
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
2021-04-15 18:05:38 +08:00
Treehugger Robot
7f7769b82e Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
2021-04-15 10:01:20 +00:00
Lorenzo Colitti
b35d038d99 Don't expose raw IBinder APIs.
APIs should not expose raw IBinder objects.

Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
2021-04-15 18:47:21 +09:00
Chalard Jean
ab6ae44092 Add documentation
Bug: 185121472
Test: doc-only change
Change-Id: I5fd68b209959043f6fe15ac34629c51233fea596
2021-04-15 18:07:56 +09:00
Chiachang Wang
9ebe6cfeb3 Remove hidden method link in public addRoute API
The build will complain after moving connectivity framework code
outside framework because the hidden methods/members accesses are
not allowed anymore. Link to a hidden class will not work since
it's not visible in public.

Bug: 182859030
Test: make docs
Change-Id: I5726f80be7cf92b648ce851d9601d5f58bc2b647
2021-04-15 16:21:00 +08:00
lucaslin
df2a314d6c Add test for [set|is]BypassableVpn
Bug: 182963397
Test: 1. atest CtsNetTestCases:NetworkAgentConfigTest
      2. atest CtsNetTestCasesLatestSdk:NetworkAgentConfigTest
Change-Id: I0250a0313d3a7561ab8efa851fbc06f5bce11185
2021-04-15 15:44:01 +08:00
Chiachang Wang
7158b6dab0 Extend framework-connectivity.impl visibility
Allow netlegacy22.api to use hidden connectivity methods.

Bug: 182859030
Test: m
Change-Id: I92936afb9fb533ea3b426490eb9617389f99fc8b
2021-04-15 13:06:39 +08:00
Junyu Lai
73aa6487df Merge "Allow network providers to set the linger duration." into sc-dev 2021-04-15 03:23:53 +00:00
Chalard Jean
aac20e132d Merge "Use filter from CollectionUtils." into sc-dev 2021-04-14 12:38:01 +00:00
Chalard Jean
e634b28204 Allow network providers to set the linger duration.
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
Ignore-AOSP-First: prevent merge conflict
CTS-Coverage-Bug: 184796264
Bug: 184227264
Change-Id: I7f420faa40863385114705d6971cf00887d03318
2021-04-14 20:26:12 +08:00
Remi NGUYEN VAN
98bab00fc9 Add a test for ParseException
The test simply creates an exception and verifies that it has the
required fields.

Test: atest FrameworksNetTests
Change-Id: I76ded2ac3f93ff3910bba3f1e4f1c17092e35372
2021-04-14 09:37:30 +00:00