Commit Graph

8943 Commits

Author SHA1 Message Date
Automerger Merge Worker
21105c9771 Clean up unit testing for ConnectivityDiagnostics.
Connectivity Diagnostics included an unnecessary try-catch for verifying
that the permissions check for invoking ConnectivityDiagnosticsCallbacks
doesn't throw when the uid and package name do not match.

Bug: 149119324
Test: atest FrameworksNetTests
Change-Id: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
Merged-In: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
(cherry picked from commit 66b5e081b785a3b7e2a032342d4d424905581cf9)
2020-03-23 17:35:15 -07:00
Cody Kesting
cf7bb0ee06 Restrict VPN Diagnostics callbacks to underlying networks.
ConnectivityDiagnosticsCallbacks should only be invoked for the
underlying networks declared by active VPNs. This encourages VPN apps to
declare their underlying networks.

The previous permission model for VPNs allowed active VPNs to receive
callbacks on any network.

Bug: 148903617
Test: atest FrameworksNetTests
Change-Id: Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b
Merged-In: Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b
(cherry picked from commit e1f0c56f74593d3781bfa4ee4871a5efbabe303c)
2020-03-23 17:35:15 -07:00
Aaron Huang
ec600a712d Merge "API review: access field by method" into rvc-dev am: de4c7dcda4
Change-Id: Ib4d6c3a3b95d8a51f5cd6202c78a4fd0c59865d7
2020-03-20 11:24:33 +00:00
Junyu Lai
6bfd764417 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 7049aa6816
Change-Id: Ia89d44bcc81b16198d2d653572c451143d208a94
2020-03-20 11:23:41 +00:00
Junyu Lai
48123708a8 Merge "Expose netId by adding getter API" into rvc-dev am: ad76cd9864
Change-Id: I169aabae9037f8d16fdd9e70166794173ae3c995
2020-03-20 11:23:03 +00:00
Aaron Huang
b449d5dd5e API review: access field by method am: 410236b92e
Change-Id: I7b5585b12cc8f6af23831df4aec92813ad9dcce7
2020-03-20 11:22:20 +00:00
Aaron Huang
de4c7dcda4 Merge "API review: access field by method" into rvc-dev 2020-03-20 11:09:43 +00:00
Chalard Jean
7229e319df Create a builder for NetworkCapabilities. am: d7d24015a5
Change-Id: Ifbc4fae6c55abfb5aa233cf9bc57f5e14f9b583c
2020-03-20 11:08:59 +00:00
Junyu Lai
7049aa6816 Merge "Create a builder for NetworkCapabilities." into rvc-dev 2020-03-20 11:03:47 +00:00
Junyu Lai
ad76cd9864 Merge "Expose netId by adding getter API" into rvc-dev 2020-03-20 11:03:05 +00:00
Lorenzo Colitti
a074f57a72 [automerger skipped] Merge "Make Ethernet interfaces more testable." into rvc-dev am: 3577796e6a -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 4574935dca is in history

Change-Id: I965e52fdc07ba09ad60beb3eee24a0b2d53065c0
2020-03-19 14:45:07 +00:00
Lorenzo Colitti
784d457b9c Make Ethernet interfaces more testable. am: 4574935dca
Change-Id: I4b8093f656a2286e48018e29c3d33e23d875742f
2020-03-19 14:44:04 +00:00
Lorenzo Colitti
3577796e6a Merge "Make Ethernet interfaces more testable." into rvc-dev 2020-03-19 14:31:57 +00:00
TreeHugger Robot
f6d0912e66 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" into rvc-dev am: 3eb3c377b8
Change-Id: Iec20a7faa193e881193dbb5617f112f9dda5a8d8
2020-03-19 13:52:03 +00:00
TreeHugger Robot
3eb3c377b8 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" into rvc-dev 2020-03-19 13:40:51 +00:00
Chalard Jean
d7d24015a5 Create a builder for NetworkCapabilities.
Bug: 151322799
Test: FrameworksWifiTests
Change-Id: I06eb97e50d5583579b3c26d1365d2dbaec8bfc99
2020-03-19 21:55:57 +09:00
Lorenzo Colitti
4574935dca Make Ethernet interfaces more testable.
This CL adds a setIncludeTestInterfaces method to EthernetManager
that, when called, causes the Ethernet service to recognize and
manage test interfaces created by TestNetworkManager.

Bug: 150644681
Test: Tested by EthernetTetheringTest in same topic
Change-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca
Merged-In: I86eef7a93267f800dbfc8eafd307effa76a344ca
(cherry picked from commit 3410fb0aa92bbd4f9d7dc031e89f6f528ff34245)
2020-03-19 12:30:39 +00:00
Mark Chien
af2f488f37 Merge "TetheringManager API clean up" into rvc-dev am: cca0c6192e
Change-Id: I57808f2f1fd904e81f8c8f9c2c7254255f335acd
2020-03-19 12:07:10 +00:00
Mark Chien
cca0c6192e Merge "TetheringManager API clean up" into rvc-dev 2020-03-19 12:04:05 +00:00
markchien
38ef330e46 Move NetworkCallback to last parameter for new exposed requestNetwork
Bug: 151243698
Test: atest TetheringTests
Change-Id: I87ef1d451eefa6998b9793c4eacabae978376d24
2020-03-19 19:10:23 +08:00
Paul Hu
b9e70f3802 Merge "Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL" into rvc-dev am: b1b08a0d45
Change-Id: Ia167028fdfe4e8ce8ea2a32d486fa7ba92f74198
2020-03-19 10:21:21 +00:00
markchien
4129ed1f13 TetheringManager API clean up
Per API review:
- @IntDef defined on the type integer parameter
- have getters on each parameter that is set in the
  TetheringRequest.Builder
- new added API should not be deprecated
Below APIs is moved from system-current to module-lib-current that only
plafrom code(e.g. ConnectivityManager and Settings) can use them.
TetheringRequest.
onTetherableInterfaceRegexpsChanged, TetheringInterfaceRegexps:
Only platform code can use them because interfaces by regular
expressions are a mechanism which is planning to be deprecated.

Also rename some constants for easier to understand.

Bug: 149858697
Bug: 151243337
Test: m doc-comment-check-docs
      atest TetheringTests
Change-Id: Idd041f0fbeca411ea23e49786a50dd7feb77ef45
2020-03-19 16:32:37 +08:00
markchien
ed55c7ad03 Expose netId by adding getter API
Bug: 151156820
Test: m
      atest TetetheringTests
Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
(cherry picked from commit 8831c4b54178753013d568c0b76bbf7487db8122)
2020-03-19 15:57:31 +09:00
Automerger Merge Worker
5637fa73e3 Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL
CONNECTIVITY_ACTION_SUPL is marked as a "temporary hack" and has
never been public. Remove this intent definition since no one is
receiving this intent and should use network callback to know the
connection change.

Bug: 109636544
Test: atest FrameworksNetTests
Change-Id: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
Merged-In: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
(cherry picked from aosp/1224697)
2020-03-19 06:53:04 +00:00
Junyu Lai
7f3d243079 Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev am: 3def549f57
Change-Id: If7ab6d44f5289726fd90d26229807e989e7ab50a
2020-03-19 06:37:17 +00:00
junyulai
9b906b52f5 [SM07] Make combine subtype configurable from Settings am: 7e6e807bec
Change-Id: I7d4c29f713b56201c1407d51087a74043816f60f
2020-03-19 06:37:13 +00:00
junyulai
7155b164fd [SM05] Enable record mobile network stats by collapsed rat type am: 56b6a95256
Change-Id: I17067d7a3b2760afd7a164bc0735a858e3a91491
2020-03-19 06:37:10 +00:00
Junyu Lai
3def549f57 Merge changes I7eaca623,Ic94da540,If330e853,Ie2d229be,Ic6b2f10f into rvc-dev
* changes:
  [SM08] Add NetworkTemplate unit test for fetching mobile data usage
  [SM07] Make combine subtype configurable from Settings
  [SM05] Enable record mobile network stats by collapsed rat type
  [SM04] Support fetching data with NetworkTemplate with subType
  [SM02] Support record mobile network stats by collapsed rat type
2020-03-19 06:29:38 +00:00
Aaron Huang
410236b92e API review: access field by method
- InvalidPacketException, public field should be a method so
  add getter to get error code.
- KeepalivePacketData, public fields should be methods so
   add getter for fields.

Bug: 151322799
Test: atest FrameworksNetTests
      atest FrameworksWifiTests
      atest FrameworksTelephonyTests: some failure in CarrierAppUtilsTest
Change-Id: Id01e6135193716cc21bba11da529bf1507a954f7
2020-03-19 11:38:24 +08:00
Lucas Lin
5f32514cf4 Merge "Add version check to prevent test fail on Android Q" into rvc-dev am: b58ce79f41
Change-Id: I817fdcddbcd48eb39771c23bce815328dd24ff02
2020-03-19 03:17:10 +00:00
Lucas Lin
b58ce79f41 Merge "Add version check to prevent test fail on Android Q" into rvc-dev 2020-03-19 03:09:46 +00:00
junyulai
92e995d9cd [SM08] Add NetworkTemplate unit test for fetching mobile data usage
Test: atest NetworkTemplateTest
Bug: 129082217

Change-Id: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
Merged-In: I7eaca623adf93f9b8d53c2e5857ecae90ea572ab
(cherry picked from commit 4670baace6c8dafe3a30330596c333d6b2389e4d)
2020-03-19 01:41:53 +00:00
junyulai
7e6e807bec [SM07] Make combine subtype configurable from Settings
Note that enabling/disabling would not take effect until device
reboot. This will be addressed in follow-up patch.

Test: 1. atest NetworkStatsServieTest SettingsBackupTest
      2. adb shell settings put global netstats_combine_subtype_enabled 1|0
Bug: 146415925

Change-Id: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
Merged-In: Ic94da540afa479ed18f1b6fbda4ae3216c37476b
(cherry picked from commit c4f77ac90bf2e48a655ad19b162fe74a23bf3fb0)
2020-03-19 01:40:55 +00:00
Remi NGUYEN VAN
77ed816383 Merge "Move sensitive field parceling bool to constructor" into rvc-dev am: 5b601f5132
Change-Id: I3e6e80e1405bcdaed8559be3442f5e7e8b7e3cfc
2020-03-19 01:37:36 +00:00
Remi NGUYEN VAN
7e22dad5bb [automerger skipped] Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev am: 91adeca366 -s ours
am skip reason: Change-Id I570efa4eb483a717d4204a18473d02653a69f46d with SHA-1 0819fa7246 is in history

Change-Id: Ibb4280d617c0daadb881b2605dad180b26236524
2020-03-19 01:37:11 +00:00
Automerger Merge Worker
7aabccb596 Move sensitive field parceling bool to constructor am: fce6aad2be
Change-Id: I0558b0614948945ddc4c4ded591b70657b1bdd78
2020-03-19 01:37:01 +00:00
Remi NGUYEN VAN
5b601f5132 Merge "Move sensitive field parceling bool to constructor" into rvc-dev 2020-03-19 01:32:48 +00:00
Remi NGUYEN VAN
91adeca366 Merge "Make LinkPropertiesTest backwards compatible" into rvc-dev 2020-03-19 01:32:17 +00:00
Remi NGUYEN VAN
db2a1efa30 Merge changes from topic "netstack_api_review" into rvc-dev am: 411bf171fa
Change-Id: Ieade72c400b11413fec2c6c7f2b3041b194efc19
2020-03-19 01:30:51 +00:00
Remi NGUYEN VAN
411bf171fa Merge changes from topic "netstack_api_review" into rvc-dev
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
2020-03-19 01:21:29 +00:00
Lorenzo Colitti
2e6a3a1e5c Merge "mtu: Add MTU parameter to Routes" into rvc-dev am: 9ab1503877
Change-Id: I44b5596edff055567b5f322b0a90c2ddb1c68094
2020-03-19 00:58:33 +00:00
Lorenzo Colitti
9ab1503877 Merge "mtu: Add MTU parameter to Routes" into rvc-dev 2020-03-19 00:50:57 +00:00
Cody Kesting
ef6eb5c9fa Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: 5c6b1f1fd0
Change-Id: Idda185ca62848f66bd1a08455db9e0df7fe964d5
2020-03-18 19:44:00 +00:00
Cody Kesting
5c6b1f1fd0 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev 2020-03-18 19:40:39 +00:00
Cody Kesting
46a0db809f Change NetworkCapabilities administrator UIDs to be stored as int[].
NetworkCapabilities#mAdministratorUids is used to track the UIDs that
are administrators of the given Network. This value was previously
stored as List<Integer>. However, general Android API Council guidelines
recommend using Arrays for primitive values. In order to be consistent
with the guidelines, updating the field to use an Array.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: I2652a5b0f276b8944454af5cb4b1383a3e054cfa
2020-03-18 17:40:24 +00:00
TreeHugger Robot
3951478bbe Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: a9c8f382d9
Change-Id: I8b43f896064dddb84986b5a8d6edad1116028a5b
2020-03-18 12:08:46 +00:00
TreeHugger Robot
a9c8f382d9 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev 2020-03-18 11:49:09 +00:00
Lorenzo Colitti
6ccc8aa265 mtu: Add MTU parameter to Routes
- Change route to update existing route
- MTU parameter added to AddRoute

Bug: 142892223
Test: unit test
Change-Id: I2164808ef628eb7c12e875f0bde7f5151bf6a5b5
Merged-In: Ie339d0cee5be12c2232a4631fed61219a0facc64
(cherry picked from commit e521f07e8b03102f1b510a3fb401993513d9c127)
2020-03-18 11:18:37 +00:00
Chiachang Wang
39aafd7fd0 Merge changes I97015365,Ic9db4b9b into rvc-dev am: f3777c09f5
Change-Id: Iadb42d352270a053e3fb5682c65ec9feb3d1b4b0
2020-03-18 10:31:22 +00:00
Chiachang Wang
167180f31c Add KeepalivePacketDataTest am: fa4521c1a7
Change-Id: I1bff4ae03f4b56376d28514dc232b528dca99603
2020-03-18 10:31:18 +00:00