LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,272 Commits 2 Branches 0 Tags
91c64b9b114ae9cabc97aef26bf2504f780ca230
Commit Graph

12272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
91c64b9b11 Merge "Address leftover comments" am: 6e253df579 am: 3b29da5cf7 am: 3bd18cce4a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f46b0c6d5c2dcce540fcb1f9d7f2cc22c934f93
 2020-12-11 10:51:37 +00:00
Chalard Jean
abb6617d31 [automerger skipped] Merge "Move module utils to the module package." into mainline-prod am: 30c0e47829 -s ours 
am skip reason: Change-Id I067eeecd458c34b7f2fbfa439072682661ac750c with SHA-1 863fb9b9d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c7bb055686d87509ecd9ccdfdacb5dc72551e8e
 2020-12-11 02:18:48 +00:00
Chalard Jean
30c0e47829 Merge "Move module utils to the module package." into mainline-prod 2020-12-11 02:07:48 +00:00
Paul Hu
3bd18cce4a Merge "Address leftover comments" am: 6e253df579 am: 3b29da5cf7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03a2140e5574088fd0768e3ac8e3f47e54c98b6d
 2020-12-10 16:32:51 +00:00
Paul Hu
3b29da5cf7 Merge "Address leftover comments" am: 6e253df579 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e2439670745ab19220e6cd44e6a62de5f61b842
 2020-12-10 16:13:09 +00:00
Paul Hu
6e253df579 Merge "Address leftover comments" 2020-12-10 15:47:27 +00:00
Paul Hu
9a0d7d2933 Merge "Revert "ConnectivityServiceTest: Mark unaudited PendingIntents with FLAG_MUTABLE_UNAUDITED"" 2020-12-10 12:27:07 +00:00
Lucas Lin
d5f5032707 Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: 984653607c am: e70771ef74 am: cf8a782105 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1eb5c4a9975fd87dfab5bb893d6c23ae2bae41c
 2020-12-10 11:54:51 +00:00
Lucas Lin
cf8a782105 Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: 984653607c am: e70771ef74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52b048b4ecd3f228c7d13aafeaa6bd852f564a46
 2020-12-10 11:15:16 +00:00
Lucas Lin
e70771ef74 Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" am: 984653607c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519792

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd216cc83e539f202e01076b97fa2d981185dc49
 2020-12-10 11:06:27 +00:00
Lucas Lin
984653607c Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService" 2020-12-10 10:57:58 +00:00
Treehugger Robot
6dc4b5aaa0 Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99 am: e42273a5f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c09a80a7dd55b357426e01b50725254a9c03148
 2020-12-10 10:01:36 +00:00
Treehugger Robot
e42273a5f7 Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 am: 249e8cab99 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd1771c329d6b4c45f85d32cf44a7499efddcbfb
 2020-12-10 09:43:15 +00:00
Lorenzo Colitti
358aeea9d3 Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f am: 5bbcd79710 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I430d7069e1dfbe89780cb459fff9e1eb63daa349
 2020-12-10 09:18:35 +00:00
Treehugger Robot
249e8cab99 Merge "[Mainline] Network netId to getNetId() migration" am: cd20ac9243 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65d8843281e3c3fe15141ad2583955e069339413
 2020-12-10 09:11:10 +00:00
Lorenzo Colitti
5bbcd79710 Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6de299ec480f1a34042d2ef2ee86f00d030510e8
 2020-12-10 09:02:40 +00:00
Treehugger Robot
cd20ac9243 Merge "[Mainline] Network netId to getNetId() migration" 2020-12-10 08:47:27 +00:00
Lorenzo Colitti
3ff54c739f Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87704813daaf2a0b4495a835abde950e683993e5
 2020-12-10 08:32:15 +00:00
Lorenzo Colitti
0da448710c Merge changes I6eb6d92b,I638e29fd,I2348b7a3 
* changes:
  Add a convenience method to update a network's capabilities.
  Disallow NetworkAgents from changing the owner UID.
  Observe mOwnerUID in NetworkCapabilities#equals.
 2020-12-10 08:11:52 +00:00
lucaslin
9d4b864916 Reimplement DumpUtils#checkDumpPermission() in ConnectivityService 
ConnectivityService is going to be a part of mainline module, to
prevent using @hide method in ConnectivityService, reimplement
DumpUtils#checkDumpPermission() in ConnectivityService.

Bug: 175177794
Test: atest FrameworksNetTests
Test: adb shell dumpsys connectivity
Change-Id: I1e4bc023b39b40a717a3a0fd8cd60aa2f25e9bdb
 2020-12-10 07:12:05 +00:00
Remi NGUYEN VAN
11119f7461 Revert "ConnectivityServiceTest: Mark unaudited PendingIntents with FLAG_MUTABLE_UNAUDITED" 
This reverts commit 7d6a49c959.

Reason for revert: Merge conflicts, should have been merged in AOSP

Change-Id: Iee0a3e76c42858bcca45517e3ca02c65bc8eac0c
 2020-12-10 04:42:06 +00:00
Xin Li
242bf496ab [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0ee91db1db -s ours am: 13e5f8e80d -s ours am: 8fdc3926b5 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id78860e6761ba4c4954c02508f16ae975e1fb161
 2020-12-10 03:59:00 +00:00
Xin Li
8fdc3926b5 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0ee91db1db -s ours am: 13e5f8e80d -s ours 
am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic11fc264d783e729729854a5f7f7b03d38d43e3e
 2020-12-10 03:47:00 +00:00
Xin Li
13e5f8e80d [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0ee91db1db -s ours 
am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1158b1e4f70b018504c963a76782c8773f698118
 2020-12-10 03:05:40 +00:00
Xin Li
0ee91db1db Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:27 +00:00
Xin Li
033b5e8ba3 DO NOT MERGE - Merge Android R QPR1 
Bug: 172690556
Merged-In: Ib81ba3288a986546bc570c3759c55d026add591a
Change-Id: I2acfeb6cfc83a80056a685355cc367a5514da069
 2020-12-09 17:55:44 -08:00
Serik Beketayev
8a826845a3 Merge "[Mainline Migration] Migrate NetworkUtils" am: 8339b3ded3 am: 59f81edbdb am: 402f439ac1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0749108e03d88af0b8c50a36f1a4ca28b9a40ce
 2020-12-10 01:05:32 +00:00
Serik Beketayev
402f439ac1 Merge "[Mainline Migration] Migrate NetworkUtils" am: 8339b3ded3 am: 59f81edbdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f91f6de3af919fff42383ba86617112624c8292
 2020-12-10 00:49:48 +00:00
Serik Beketayev
59f81edbdb Merge "[Mainline Migration] Migrate NetworkUtils" am: 8339b3ded3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc0a49e76f87a741f4410b53e9a40012e37fde36
 2020-12-10 00:08:03 +00:00
Serik Beketayev
8339b3ded3 Merge "[Mainline Migration] Migrate NetworkUtils" 2020-12-09 23:47:05 +00:00
Lorenzo Colitti
00e0f5af3e Add a convenience method to update a network's capabilities. 
Almost all calls to ConnectivityService#updateCapabilities use
all the current data in the network, and thus call the method
like this:

    updateCapabilities(nai.getCurrentScore(), nai, nai.networkCapabilities);

Introduce a convenience method to simplify this frequent use case.

Bug: 173331190
Test: passes existing ConnectivityService tests
Change-Id: I6eb6d92bd159f2575d10a929bd59f6dd1b7a4b4e
 2020-12-10 00:41:06 +09:00
Lorenzo Colitti
39b4c5b2da Disallow NetworkAgents from changing the owner UID. 
The current behaviour with regards to changing the owner UID is
bizarre and arguably incorrect. A NetworkAgent can change the
owner to whatever other app it wants, regardless of signatures,
at any time. This includes, for example, transferring ownership
to another UID and then recovering it.

Fortunately no existing NetworkAgent appears to do this:
- ClientModeImpl sets it to the UID of the app that created the
  configuration. It doesn't look like it can change while the
  network is connected.
- Vpn sets it to the UID of the VPN owner. That also can't change.
- Telephony does not appear to set it at all, it only sets the
  administrator UIDs (and updates them whenever it gets
  EVENT_CARRIER_PRIVILEGED_UIDS_CHANGED).

Disallow this now before code is written that depends on it.

Bug: 175188445
Test: modified tests in ConnectivityServiceTest
Change-Id: I638e29fda2481ec3bf4fff562ea66a73322881df
 2020-12-09 19:47:17 +09:00
Lorenzo Colitti
cb9bbf2c80 Observe mOwnerUID in NetworkCapabilities#equals. 
Currently, NetworkCapabilities's equals and hashCode methods
ignore mOwnerUID. This is confusing because it is inconsistent
with pretty much every other member of this class.

Bug: 175188445
Test: atest CtsNetTestCases:NetworkAgentTest \
            CtsNetTestCases:Ikev2VpnTest \
	    CtsNetTestCases:VpnServiceTest HostsideVpnTests \
	    CtsNetTestCases:android.net.cts.ConnectivityDiagnosticsManagerTest \
	    ConnectivityServiceTest com.android.server.connectivity.VpnTest
Change-Id: I2348b7a35f32a931687f2d3c2fa57620a12fe06f
 2020-12-09 19:33:32 +09:00
Serik Beketayev
284cb871fa [Mainline] Network netId to getNetId() migration 
Bug: 175085315
Test: atest
Change-Id: I3d7366ba1e60be3ff7c6dd6c589db760b182136b
 2020-12-08 16:34:38 -08:00
Cody Kesting
d471c50620 [automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -s ours am: 1338b6c158 -s ours 
am skip reason: Change-Id I20d0cad5f902708d366aa703c2893b0ea3e55052 with SHA-1 054451e170 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I766b99d3fdba7eb7a556adf808e5041ad70a7a51
 2020-12-08 20:09:37 +00:00
Cody Kesting
1338b6c158 [automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -s ours 
am skip reason: Change-Id I20d0cad5f902708d366aa703c2893b0ea3e55052 with SHA-1 054451e170 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cdd7edda3f94d66aa7e0bdc6daaaf5a08b360c0
 2020-12-08 19:52:11 +00:00
Lorenzo Colitti
4eb55bc947 Merge "Test for the current behaviour of updating a network's owner UID." am: aafcaa9fb5 am: 62976a3a26 am: 8e44d9d778 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic97c893a17dcf7ce18fe31ff05828d4fe9a5e929
 2020-12-08 11:02:46 +00:00
Lorenzo Colitti
8e44d9d778 Merge "Test for the current behaviour of updating a network's owner UID." am: aafcaa9fb5 am: 62976a3a26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ed6c0ba300b34e84db911cbe9554f63712e2a1c
 2020-12-08 10:47:15 +00:00
Lorenzo Colitti
62976a3a26 Merge "Test for the current behaviour of updating a network's owner UID." am: aafcaa9fb5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512690

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35a50be2f748177cde9400449386465d77a21556
 2020-12-08 09:55:56 +00:00
Lorenzo Colitti
aafcaa9fb5 Merge "Test for the current behaviour of updating a network's owner UID." 2020-12-08 09:10:08 +00:00
Lorenzo Colitti
fadf84faf6 Merge "Add comments to the process*FromAgent methods." am: 300f6e7669 am: cba9e716fc am: 4c0f2da4ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: I8de245bb78f39cd9c99d2e5f44dc1ade3c229c15
 2020-12-07 21:13:40 +00:00
Lorenzo Colitti
d1bff1fafd Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: ee3c193706 am: 4f4ac4840d am: 964daa1a04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Ib3cf8cfb3f658e119d6c725653fcfaa385766b1f
 2020-12-07 21:00:25 +00:00
Ashwini Oruganti
cc1039b7c7 Merge "ConnectivityServiceTest: Mark unaudited PendingIntents with FLAG_MUTABLE_UNAUDITED" 2020-12-07 19:41:50 +00:00
Lorenzo Colitti
4c0f2da4ea Merge "Add comments to the process*FromAgent methods." am: 300f6e7669 am: cba9e716fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: I9d3d9d49fe6118edc4357edc1350d1f2b89f4b2a
 2020-12-07 17:34:04 +00:00
Lorenzo Colitti
cba9e716fc Merge "Add comments to the process*FromAgent methods." am: 300f6e7669 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519518

Change-Id: Ia90b3ae008561b2ec3723770802815b46937022e
 2020-12-07 17:07:08 +00:00
Lorenzo Colitti
300f6e7669 Merge "Add comments to the process*FromAgent methods." 2020-12-07 16:44:11 +00:00
Lorenzo Colitti
76a1031d33 Test for the current behaviour of updating a network's owner UID. 
The current behaviour is at least bizarre and arguably incorrect.
Add a test to document the current behaviour so we can check that
any changes we make to this behaviour are correct.

Test: test-only change
Change-Id: I345bd320eced96316d92e520f576ae06b8020d9f
 2020-12-08 01:40:47 +09:00
Lorenzo Colitti
3c75ca829e Add comments to the process*FromAgent methods. 
Test: comment-only change
Change-Id: I5ebf6e21d79ed669f85ddf9bf466236d4bd59243
 2020-12-08 01:17:17 +09:00
Serik Beketayev
88bf984e07 [Mainline Migration] Migrate NetworkUtils 
Migrating makeStrings(), numericToInetAddress() APIs

Bug: 173089079
Test: atest FrameworksNetTests
Change-Id: Ie914fd41bc3ce16d07f5d2768b89ce805b9245a9
 2020-12-06 22:33:04 -08:00
Lorenzo Colitti
964daa1a04 Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: ee3c193706 am: 4f4ac4840d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Id6951382cd12dff2e4f1bd2fe47d063c8998fc2f
 2020-12-07 05:18:13 +00:00