LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
410 Commits 2 Branches 0 Tags
4e8bb42a55240e965aa2db97b8616c53549e2331
Commit Graph

410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
4e8bb42a55 resolve merge conflicts of c85aeee86ec35f9e942e02e7d13450dce47b1325 to sc-dev 
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: Idd5d75e0e9a7ad4f840b88da55d28fbaa2275dd0
 2021-03-18 14:50:05 +00:00
Remi NGUYEN VAN
a796abb03f Merge changes I4ad0ca60,I8a03162b into sc-dev 
* changes:
  Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks
  Add multipath preference, background status API
 2021-03-18 14:07:12 +00:00
Paul Hu
fd85356b4d Merge "Add more connectivity module settings" am: b998511728 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784

Change-Id: If6fab011720145f2ba18df478e6660be442bcad5
 2021-03-18 12:53:52 +00:00
Paul Hu
b998511728 Merge "Add more connectivity module settings" 2021-03-18 12:22:55 +00:00
Remi NGUYEN VAN
b81eff2192 Merge changes I77a3efca,I2c4a37ff into sc-dev 
* changes:
  Migrate framework-connectivity internal resources
  Add connectivity protos to framework-connectivity
 2021-03-18 11:16:25 +00:00
Remi NGUYEN VAN
e5a4a9a078 [automerger skipped] Remove extra comment am: efd24e0f3a am: 79672e35a3 -s ours 
am skip reason: skip tag Change-Id I0c0daa91ef272a19c548cf55eb2f764c95f8f844 with SHA-1 bcea4c8e06 is already in history

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

Change-Id: Ia8523fc8557bea3d9635d23472e4301e9b43fde5
 2021-03-18 10:42:10 +00:00
Remi NGUYEN VAN
749a39a431 Migrate framework-connectivity internal resources 
Use ServiceConnectivityResources instead.
Start by creating resources in the ServiceConnectivityResources package
to match the internal configuration, and common overlays.

Bug: 182125649
Test: device boots, has connectivity
Change-Id: I77a3efca2cd644f9828db1ed5d3cae8070fb8363
 2021-03-18 09:02:13 +00:00
Remi NGUYEN VAN
8c2d521b8d Add connectivity protos to framework-connectivity 
The protos are built separately by framework-connectivity from framework
protos, keeping only android.net protos for the connectivity jar.

Bug: 171860710
Test: m framework-connectivity.impl
Change-Id: I2c4a37ff2ee9e8efde49885feeafa27dcff7ca2c
 2021-03-18 08:07:20 +00:00
Remi NGUYEN VAN
efd24e0f3a Remove extra comment 
This fixes a merge conflict with downstream branches due to an
incomplete cherry-pick.

Bug: 171540887
Test: m

Merged-In: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
Change-Id: I0ec602f573698578e4d72d38772c39a1b88b87d2
 2021-03-18 07:11:48 +00:00
Remi NGUYEN VAN
1fdeb50d9a Add multipath preference, background status API 
Add APIs for getMultipathPreference and getRestrictBackgroundStatus.
Both are used by Connectivity to back the external
ConnectivityManager.getRestrictBackgroundStatus, and
ConnectivityManager.getMultipathPreference APIs.

Test: atest CtsNetTestCases
      atest ConnectivityServiceTests
      atest NetworkPolicyManagerServiceTest
Bug: 176289731
Change-Id: I8a03162b2f6691086bb64e75ffd354cdfca7f86a
 2021-03-18 06:08:00 +00:00
Remi NGUYEN VAN
2c196b6487 Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 am: 5e478bf5bf am: 954160f749 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635039

Change-Id: Ief30f77f949669d9b52ae3a6fe84f8db91179841
 2021-03-18 04:36:38 +00:00
paulhu
c9925e096b Add more connectivity module settings 
Add more connectivity module settings and update all references
to ConnectivitySettingsManager.

Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: Ie96fbd0996ed3acb37099b6270bf3d4c2e558e9a
 2021-03-18 11:58:29 +08:00
Remi NGUYEN VAN
5e478bf5bf Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635039

Change-Id: I9956c78228c2d04e20edf6fee1061861e26978b9
 2021-03-18 03:33:42 +00:00
Paul Hu
56824ea17f Merge "Add ConnectivitySettingsManager" am: 236835e920 am: f1fbb30c09 am: dc9bfe3386 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641759

Change-Id: Ib5ec1f8cc443d1b92215e6ab200fa383d719d053
 2021-03-17 22:21:22 +00:00
Remi NGUYEN VAN
c13ff4aff6 Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5a819fb84d am: 41fe4bfcd4 am: b9a3b1b03b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266

Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8
 2021-03-17 22:20:59 +00:00
Remi NGUYEN VAN
bcea4c8e06 [automerger skipped] Merge "Remove extra comment" am: 92d50295e2 -s ours am: 0da809051c -s ours am: aec47bb4bc -s ours 
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 ad43ca6d40 is already in history

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

Change-Id: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
 2021-03-17 22:20:12 +00:00
Lucas Lin
3fca5b232f Merge "Modify the comment of getPrivateDnsMode" am: 625db39870 am: bdc4e22fe4 am: afcec9cbfe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143

Change-Id: I60147e1c828e5d82556e58b67b8f138f63228e8f
 2021-03-17 22:19:20 +00:00
Remi NGUYEN VAN
cae9ed6a14 Merge "Remove usage of networkAttributes" am: adf6d20f8f am: e74de6db5a am: 0aff3ed968 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260

Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b
 2021-03-17 22:18:55 +00:00
Lucas Lin
5671c0fea4 [automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 253a041a13 am: 47984f7022 am: 33f340b54a -s ours 
am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 2a4c17c3b3 is already in history

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

Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9
 2021-03-17 22:13:33 +00:00
Chalard Jean
0f15b90f34 Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: 24a9b5cad6 am: 1f51df82b1 am: 35b284e0ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621

Change-Id: I5fa8e7b8bf35a5464868fdca4d115b3f9132c65f
 2021-03-17 22:13:06 +00:00
Remi NGUYEN VAN
7f22e754de Merge "Remove MessageUtils usage in VpnTransportInfo" am: 4ad3ac7de6 am: d7bd61b340 am: bdaef78b90 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041

Change-Id: Ibf1592220cedb387d8edba27a7bbe49a36f42dc0
 2021-03-17 22:10:16 +00:00
Junyu Lai
88ee4f1d03 Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 96e1290b7a am: 71bc2b560d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047

Change-Id: Ic0cb87f3ac4e9df7b0b6e2d0344c43e66499900e
 2021-03-17 22:08:56 +00:00
Junyu Lai
b4d8384170 Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: 67a2b3eb30 am: 14865c4e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: Ie252014cd9047c27fad3e451b80047493935dc3d
 2021-03-17 16:08:50 +00:00
Paul Hu
4d39725b04 Merge "Replace interal okhttp APIs" am: 4fe7ff8d1f am: 7bd3aa2a13 am: 542786989d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: Ida687a8987385ef4525e41e609d7c8fedda9f1da
 2021-03-17 16:07:31 +00:00
Lucas Lin
76c10401b5 Merge "Add comments to describe the value of converting hex to decimal" am: 3453ec5024 am: 3fa2c3e87a am: 172cce09da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: I0f978fd5fa0283a40db2897478483d680d44e9e9
 2021-03-17 16:05:47 +00:00
Lucas Lin
f6ba0a741c [automerger skipped] Merge "Have a new API to get private DNS mode" am: b79ae17835 am: 0839a2791b am: 3373b94c0d -s ours 
am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 180f44f0f2 is already in history

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

Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c
 2021-03-17 16:05:23 +00:00
Chalard Jean
7f2fddf60e Merge "[NS01] Add NetworkScore" am: 2a9450c234 am: c8aa29e41e am: 2d07595731 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I953a773f8914152578a98d71b43d0a2e30a51aba
 2021-03-17 16:04:22 +00:00
Remi NGUYEN VAN
fa39a26f93 Merge "Add ParseException constructors to API" am: a10ea9b5ee am: ff2bca11b2 am: a375a561a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: I4e4b1f4a70fcfaa43fa9b612e7fbd151093fd8fe
 2021-03-17 16:03:23 +00:00
Remi NGUYEN VAN
78c6f60e6d [automerger skipped] Merge "Create ServiceConnectivityResources" am: d9d976f8f5 am: 33674f408b am: 1154393902 -s ours 
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 56520566ce is already in history

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

Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6
 2021-03-17 16:02:18 +00:00
Remi NGUYEN VAN
eb6aa22205 Add framework-connectivity.impl 
The library will be included in the connectivity module APEX when
migrating its sources out of framework-minus-apex.

Bug: 171540887
Test: m
Change-Id: I1595521eaced6e6997c076bb56b06ffdd22a4fa0
 2021-03-18 00:29:08 +09:00
Paul Hu
f1fbb30c09 Merge "Add ConnectivitySettingsManager" am: 236835e920 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641759

Change-Id: I84e3e2eb6f507abf6220b43886f6ab9e1fad4218
 2021-03-17 15:27:02 +00:00
Remi NGUYEN VAN
41fe4bfcd4 Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5a819fb84d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266

Change-Id: Ieca69d4ff1d2a7f3b369bb4dcabaa702fbab4594
 2021-03-17 15:19:31 +00:00
Paul Hu
236835e920 Merge "Add ConnectivitySettingsManager" 2021-03-17 14:57:32 +00:00
Remi NGUYEN VAN
5a819fb84d Merge "Remove Protocol.BASE_* usage in Connectivity" 2021-03-17 14:53:26 +00:00
Remi NGUYEN VAN
0da809051c [automerger skipped] Merge "Remove extra comment" am: 92d50295e2 -s ours 
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 6916d5194b is already in history

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

Change-Id: Ifd4bbb99c60e9d538fc87d5015dc2b0f7af4d125
 2021-03-17 12:54:22 +00:00
Remi NGUYEN VAN
92d50295e2 Merge "Remove extra comment" 2021-03-17 12:16:09 +00:00
Remi NGUYEN VAN
1b9f03a190 Remove Protocol.BASE_* usage in Connectivity 
ConnectivityManager and NetworkAgent do not share their handler with any
other component, so there is no reason to use addresses that do not
overlap. Protocol.BASE_* was written to allow for interaction "between
different StateMachine implementations without a conflict", but the
classes do not use StateMachine, and they do not have such interactions.

Bug: 177046265
Test: atest FrameworksNetTests
Change-Id: I18c341d4a2c01cb9559d682a9ad1ff259e6b5855
 2021-03-17 20:56:50 +09:00
Lucas Lin
bdc4e22fe4 Merge "Modify the comment of getPrivateDnsMode" am: 625db39870 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143

Change-Id: I46131b18e8e09d1c2b7a0b3fe5913511942b7096
 2021-03-17 11:54:29 +00:00
Remi NGUYEN VAN
e74de6db5a Merge "Remove usage of networkAttributes" am: adf6d20f8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260

Change-Id: I52a3125843e093c5a7d0d80c2a5c9608b397ea00
 2021-03-17 11:51:17 +00:00
Lucas Lin
625db39870 Merge "Modify the comment of getPrivateDnsMode" 2021-03-17 11:25:18 +00:00
Remi NGUYEN VAN
adf6d20f8f Merge "Remove usage of networkAttributes" 2021-03-17 11:24:28 +00:00
Remi NGUYEN VAN
5b9dd87333 Remove extra comment 
This fixes a merge conflict with downstream branches due to an
incomplete cherry-pick.

Bug: 171540887
Test: m

Change-Id: I27a8f20f1a1d83b472700648f3f5a68413a76ac3
Merged-In: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
 2021-03-17 10:58:08 +00:00
paulhu
845456ebdc Add ConnectivitySettingsManager 
This class is used to manager the connectivity module related
settings.

Bug: 182538166
Test: make
Change-Id: I5e02e719ce0d305d7c8a45fefb850d7b981f07eb
 2021-03-17 18:24:16 +08:00
Lucas Lin
47984f7022 Merge "Change the parameter type from ContentResolver to Context" am: 253a041a13 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900

Change-Id: I6a91019bf0b10175885d146e77f98533ad702f8c
 2021-03-17 07:02:18 +00:00
lucaslin
debfe6062a Modify the comment of getPrivateDnsMode 
Bug: 172183305
Test: m
Change-Id: I2f1b44cf2a362b42f052ea5d34a5cec03d46e661
 2021-03-17 14:53:35 +08:00
Lucas Lin
253a041a13 Merge "Change the parameter type from ContentResolver to Context" 2021-03-17 06:35:21 +00:00
Chalard Jean
1f51df82b1 Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: 24a9b5cad6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621

Change-Id: I641df2f25ba989af597952a03488c817c82323c2
 2021-03-17 06:21:55 +00:00
Chalard Jean
24a9b5cad6 Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 
* changes:
  Remove per-user preference when the user is removed
  Expose the enterprise per-profile networking API.
  Implement setNetworkPreferenceForUser.
  Public API for per-profile network preference.
  Add tests for setNetworkPreferenceForUser
 2021-03-17 05:48:18 +00:00
Lucas Lin
7b2feb74bc Merge "Change the parameter type from ContentResolver to Context" into sc-dev 2021-03-17 03:27:28 +00:00
Remi NGUYEN VAN
d7bd61b340 Merge "Remove MessageUtils usage in VpnTransportInfo" am: 4ad3ac7de6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041

Change-Id: If3c85705ecc0d27b9d365b302378329637474a80
 2021-03-17 01:04:06 +00:00