Commits · 5c0b66eddb5b23f0aacc9b79f78dc9c240b9faf1 · LMODroid / platform_packages_modules_Connectivity

Jan 13, 2025

Drop packets to VPN address ingressing via non-VPN interface · 5c0b66ed

Motomu Utsumi authored 7 months ago and

Mohammad Hasan Keramat J committed 2 months ago

Cherry-pick of aosp/2795711 to backport VPN security fix to non-mainline
U devices.
Since isTetheringFeatureNotChickenedOut is not available on U branch,
this feature is enabled on T+ devices without kill switch.
Also, this CL removes test changes since CSTest utilities are not
available on u branches.

When there are addresses that are used by a single VPN interface,
ConnectivityService sets ingress discard rules to drop packets to this
address from the non-Vpn interfaces

Bug: 193031925
Test: TH
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d493a3aa7dcca3219b139616c9de3c6ee8181f86)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1027bc813ea6a5b97bc0f55401e01f5eec91e94a)
Merged-In: I5933d42f3fd257139fb803ede1391e10d9d1211b
Change-Id: I5933d42f3fd257139fb803ede1391e10d9d1211b

5c0b66ed

Nov 08, 2024

Revert "Stop reading UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting in PermissionMonitor" · 741ed0b4

Chirayu Desai authored 4 months ago and

Dhina17 committed 4 months ago

This reverts commit ed2a84a6f0ce004821c4a4889aee917aa123d74a.

Reason for revert: No longer needed after
I78ff47624e520f9a3fe492165544d93edbbe814d

Change-Id: I7b886c83e767e0aab52227ccee4944a3b40964da

741ed0b4

Firewall: More apps/uids again · 2022fa94

Tommy Webb authored 1 year ago and

Dhina17 committed 4 months ago

Bumping again. See I293f99ec498e4ccac98c39f298ba01ba554f2e33.
Reasons are all the same. MEMLOCK_RLIMIT is not a concern anymore
because libbpf will automatically increase it if needed for kernels
not using cgroup accounting.

Issue: calyxos#1249
Change-Id: I0ce50383e210e936696d4294b63342e700081313

2022fa94

Jun 17, 2024
- Merge tag 'android-14.0.0_r50' into fourteen · cfb5042c
  Mohammad Hasan Keramat J authored 8 months ago
  
  Android 14.0.0 Release 50 (AP2A.240605.024) Change-Id: I0054958e40ca77339f8122b531b3d69b48965063
  cfb5042c
Apr 10, 2024

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26874925'] into 24Q2-release. · c27109a8
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: I3733a70cb31cc2dec9a548bd4f9a6c8d3ccf1951
```
c27109a8

Import translations. DO NOT MERGE ANYWHERE · ecd36bc5

Bill Yi authored 11 months ago

Bug: 328603775

Auto-generated-cl: translation import
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2aff829ed513563691bfd1decae4f9bdd34cffbd)
Merged-In: Ic33b6ba3194ab18ff97f4b87360326037172a735
Change-Id: Ic33b6ba3194ab18ff97f4b87360326037172a735

ecd36bc5

Apr 08, 2024

Merge cherrypicks of ['android-review.googlesource.com/2902330'] into 24Q2-release. · 2661ada1
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: I508b65f211d64d99bb8413da9f78a3305e664519
```
2661ada1

Add testAllowedUids for devices without FEATURE_TELEPHONY_SUBSCRIPTION · 3f4a1f1b

Motomu Utsumi authored 1 year ago

Test: atest android.net.cts.NetworkAgentTest#testAllowedUids
Bug: 317454816
(cherry picked from https://android-review.googlesource.com/q/commit:2982e9f2a067eddb4fee9968033ea7f783b37fa4)
Merged-In: I76c05d48e97e6fc0e1842f9ba731dbece347f286
Change-Id: I76c05d48e97e6fc0e1842f9ba731dbece347f286

3f4a1f1b

Apr 02, 2024

Merge cherrypicks of ['android-review.googlesource.com/3009853'] into 24Q2-release. · 69edc1e3
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: Ieef9d93e7d0b821122b3d5d8a19bf4d9390a8d17
```
69edc1e3

Fix flakes due to networks obtained via sync APIs · 7006b45b

Remi NGUYEN VAN authored 11 months ago

After reconnectWifiIfSupported is called, it is possible that
ConnectivityManager#getAllNetworks does not return the Network, as this
is mixing network callbacks and synchronous calls which is racy (as per
ConnectivityManager javadoc).

Ensure that networks that are reconnected in the test, wifi and
cellular, are obtained through network callbacks through CtsNetUtils.

Other networks are still obtained through the synchronous call, as they
should not change during the test, and there would be no non-racy way to
obtain them otherwise anyway as they are not guaranteed to be connected.

Bug: 328331492
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:f8999e32e1e6de820ee62ee3a8becce07c512595)
Merged-In: I5a511c87c64fde0276aecd6ff6599815fa08e437
Change-Id: I5a511c87c64fde0276aecd6ff6599815fa08e437

7006b45b

Squshed revert of deprecated cloudfare DNS changes · b32fcd47

Dhina17 authored 11 months ago

Reverts:
- DnsUtils: Use Cloudflare DNS instead of Google DNS
- NetworkDiagnostics: Use Cloudflare DNS instead of Google DNS
- Tethering: Use Cloudflare DNS instead of Google DNS
- Add Cloudflare DNS as a private DNS provider

Accidently merged.
and cloudfare DNS changes only touches packages/apps/Settings now.

Change-Id: I322c8553b4d9adb576fa3a302a0820ca9524e94c

b32fcd47

DnsUtils: Use Cloudflare DNS instead of Google DNS · 8f646827

Chirayu Desai authored 4 years ago and

Mohammad Hasan Keramat J committed 11 months ago


Change-Id: Ide51c086d2570aa5ecf28868e13f4f1672a4ff8a
(cherry picked from commit e1d2f34fb3614eb903a6538969494f7d43e52dbd)
Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>

8f646827

NetworkDiagnostics: Use Cloudflare DNS instead of Google DNS · 43d00886

Chirayu Desai authored 4 years ago and

Mohammad Hasan Keramat J committed 11 months ago


Change-Id: I1300cff1609ebe87a6bec58b65cc724920a091bc
(cherry picked from commit 8649aebad397dc3544348f88fac51fc8e4ac7347)
Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>

43d00886

Tethering: Use Cloudflare DNS instead of Google DNS · aac99165

Chirayu Desai authored 5 years ago and

Mohammad Hasan Keramat J committed 11 months ago


Change-Id: I1394b33e883d82c4d593d0f84bb0beb551cccc92
(cherry picked from commit cf7af52ef68c5d90872ee42083d308c5c5b790ad)
Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>

aac99165

Add Cloudflare DNS as a private DNS provider · ecf3623c

Chirayu Desai authored 5 years ago and

Mohammad Hasan Keramat J committed 11 months ago


TODO: Add tests

Also includes:
commit d82a7a0585671903ba18cd1d8fab25d9275c2a25
Author: Oliver Scott <olivercscott@gmail.com>
Date:   Fri Jan 29 10:57:26 2021 -0500

    Fix Cloudflare private DNS provider

    Change-Id: I5932d8d7e82621220eb119a212ccecf15e284421
    (cherry picked from commit 24abf646a0df5e00285d1b698adec03eb897388f)

Change-Id: I7e8a320d47e7c5ddbcb9acfaf23032ae92d5d70d
(cherry picked from commit 96ce93f7bf7233008591d22a0d24a6d7cd0a94ff)
Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>

ecf3623c

Apr 01, 2024

Remove sdk level check when calling getDataSaverEnabled · 0461823b

Junyu Lai authored 1 year ago and

Mohammad Hasan Keramat J committed 11 months ago

Follow-up from aosp/2856948, the data saver status value is
filled by ConnectivityService before Android V. Thus, calling
BpfNetMapsReader#getDataSaverEnabled() is a legit use case, which
should not trigger log.wtf.

Remove the check accordingly.

Test: TH
Bug: 314858283
Fix: 316839561
Change-Id: I90c85ab98fbefd1f99ec799a4eec8d1d0cfd47b0

0461823b

netd: Remove <4.14 kernel restrictions · e19716f0
Michael Bestas authored 1 year ago and Mohammad Hasan Keramat J committed 11 months ago
```
Change-Id: I4d4abbacd6b9589260de06663e2143bc37d8ea0f
```
e19716f0
netbpfload: Support <4.14 kernels · 68bf7864
Michael Bestas authored 1 year ago and Mohammad Hasan Keramat J committed 11 months ago
```
Change-Id: I3d6573c102c1d64a64209bf61ecb8ed0c4ecb64c
```
68bf7864
netbpfload: Relax kernel version requirement · 8a4323c7
Nanhumly authored 1 year ago and Mohammad Hasan Keramat J committed 11 months ago
```
Change-Id: Ic875fd15b407c0cb387fc51ee5a9dc6e132db2d1
Signed-off-by: Nanhumly <admin@warbler.cc>
```
8a4323c7

NetBpfLoad: more 4.9-T support · 579361cb

Maciej Żenczykowski authored 1 year ago and

Mohammad Hasan Keramat J committed 11 months ago


(older kernels don't support naming maps/programs)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If59b8947021394e1ce0a91326fee4272a5bddd38

579361cb

netbpfload: add back support for 4.9-T kernels · 12062ccd

Maciej Żenczykowski authored 1 year ago and

Mohammad Hasan Keramat J committed 11 months ago


This effectively reverts aosp/2268766

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I42da5c56fe4b69635b9678ff57ade7788c17f7c8

12062ccd

Mar 29, 2024

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26721922'] into 24Q2-release. · 3c198510
Android Build Coastguard Worker authored 11 months ago
```
Change-Id: I4e91e57f9a9cfa2c8f0eafe3ead0bb994d5b9227
```
3c198510

Import translations. DO NOT MERGE ANYWHERE · 1674943a

Bill Yi authored 11 months ago

Auto-generated-cl: translation import

Bug: 328603775
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:855bceb771f71964f8d13c5bcda831a01f4dcdd8)
Merged-In: I989d916b945e8b118c3f4574b838e738b2b3b36a
Change-Id: I989d916b945e8b118c3f4574b838e738b2b3b36a

1674943a

Mar 19, 2024

Merge tag 'android-14.0.0_r29' into fourteen · 528e3863

Dhina17 authored 11 months ago

Android 14.0.0 release 29

 Conflicts:
	Tethering/src/com/android/networkstack/tethering/UpstreamNetworkMonitor.java
	bpf_progs/netd.c
	service/src/com/android/server/ConnectivityService.java

Change-Id: I28318b3004dd28c4ec8c53b46177961671e06993

528e3863

Mar 05, 2024
- Snap for 11526283 from 790e72d7 to 24Q2-release · d3ea0a73
  Android Build Coastguard Worker authored 1 year ago
  
  Change-Id: I3431b6677c23db0b2c084dfb9cfd45e92653c05b
  d3ea0a73
Mar 04, 2024

Merge "Drop platform_apis from android_library" into main am: am: · 790e72d7

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2971691

Change-Id: Ib26f29d1326d4036dc15cc76384c2302f971eb41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

790e72d7

Merge "Drop platform_apis from android_library" into main am: am: · c6976819

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2971691

Change-Id: I6456309001f3e1495a1d14e25a257f3294e81c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c6976819

Merge "Drop platform_apis from android_library" into main am: · c886abf0

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2971691

Change-Id: Icdebb4aa6c89fd88124120973045b7530b7f5c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c886abf0

Merge "Drop platform_apis from android_library" into main am: · 83e53650

Treehugger Robot authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2971691

Change-Id: I455c1a588c6bb8640306039bd890ce59bbd05f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

83e53650

Revert "24Q2: use mainline netbpfload from apex" am: am: · 9d3761a5

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2986117

Change-Id: If3a0e49b7784ae266b4edae35d75cd9251bb8bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9d3761a5

24Q2: use mainline netbpfload from apex am: am: · da4d7246

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954707

Change-Id: I02f6b782d0d09ab4687597eb2444f0a89413db06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

da4d7246

Revert "24Q2: use mainline netbpfload from apex" am: am: · 26f760a2

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2986117

Change-Id: Ibc37d6587d9df8ea365b339e729057aa908f58ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

26f760a2

24Q2: use mainline netbpfload from apex am: am: · e5056664

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954707

Change-Id: I9b62c9bf44ab76edbe6871ea4ec719d8c88bc6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

e5056664

Merge "Drop platform_apis from android_library" into main · e2e1dc10
Treehugger Robot authored 1 year ago

e2e1dc10

Revert "24Q2: use mainline netbpfload from apex" am: · fd394058

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2986117

Change-Id: I97c08b3743925b114b85bef510cd90afbb92ca96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fd394058

24Q2: use mainline netbpfload from apex am: · 0fda3dd3

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954707

Change-Id: Iddf496b3c2f9bddc8baa43facfffbe5c96bfc8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

0fda3dd3

Revert "24Q2: use mainline netbpfload from apex" am: · 8e2a22c2

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2986117

Change-Id: If153c0a21b7dd5f35ac35f6c24652b889d5008f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8e2a22c2

24Q2: use mainline netbpfload from apex am: · 87faf7f5

Maciej Żenczykowski authored 1 year ago

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954707

Change-Id: Id78c598cbdbeeeb12be4cde1360fa8b45ddc3b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

87faf7f5

Revert "24Q2: use mainline netbpfload from apex" · e36d77c3

Maciej Żenczykowski authored 1 year ago

This reverts commit 13b5e1ff.

Reason for revert: wasn't sent for review

Change-Id: Ibbf514e0ce506e2720f3d98f12beab7c4d14e133

e36d77c3

24Q2: use mainline netbpfload from apex · 13b5e1ff

Maciej Żenczykowski authored 1 year ago

(also monitor https://pitot.corp.google.com/clusters?release=public-all&comparison=target&device_view=ALL_DEVICES&duration=56&clusters.search=BpfLoaderRcUtils )

See also:
  https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2956635


  netbpfload: enable on U QPR2 (aka 24Q1)  [target May mainline]

Test: TreeHugger, atest FrameworksNetTests:android.net.connectivity.com.android.server.BpfLoaderRcUtilsTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie9e0f90321265f33a23deb03b403fb73b6a1db05

13b5e1ff