Commit Graph

71599 Commits

Author SHA1 Message Date
Paul Hu
19ef415161 Merge changes from topic "PermissionMonitorOnHandlerThread" am: 562cdacfee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2194528

Change-Id: I496211ff835ac2fdaf0fe122fc9eccfa17e43a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 03:31:55 +00:00
Paul Hu
562cdacfee Merge changes from topic "PermissionMonitorOnHandlerThread"
* changes:
  Add synchronized to UidRange getter and dump methods
  Deal with permission update on handler thread
  Running PermissionMonitor#startMonitoring on handler thread
2022-11-23 02:59:17 +00:00
Mohannad Farrag
a23114ad94 gn2bp: Add cronet_package to update_results.sh
* This will include all of the java files needed to build cronet java.

Test: m cronet_aml_components_cronet_android_cronet
Change-Id: Idc0f61a5f290eca1a03253b622c416c65eba04c9
2022-11-22 17:47:51 +00:00
Mohannad Farrag
4bea14a4e0 gn2bp: Fix parsing java sources for multi-arch
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I678779c296753c07ada321225cb48ee10357657e
2022-11-22 15:38:30 +00:00
Chidera Olibie
3332fd1ce8 Cronet: Fix linting errors for API tests
- Fix import order
- Change test naming convention
- Rename VerifyUrlRequestCallback to TestUrlRequestCallback

Test: CronetApiTest
Bug: 251012627
Change-Id: I4dddf8e75b788b1c9091b00e1e15385f4658353a
2022-11-22 14:36:18 +00:00
Mohannad Farrag
baf0d57a74 gn2bp: Convert source_set with rtti to static_libraries
* `source_set` were converted to cc_defaults and this would pose a huge problem if those cc_defaults had rtti on since it affected all of the dependencies of the source target.
* The solution here would be to compile the `source_set` independently as a static/shared library with rtti on then link it.

Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I28bbe0947d0dc87c2d602514a2759a3171b68aa2
2022-11-22 12:52:39 +00:00
Paul Hu
ea62910ed2 Add synchronized to UidRange getter and dump methods
- The UidRange getter and dump methods which is to access
  mVpnInterfaceUidRanges and mVpnLockdownUidRanges need to guard
  with synchronized to ensure the value won't be changed during
  accessing.
- Also make getVpnLockdownUidRanges() to be a package-private
  method. It's accessed from PermissionMonitorTest only.

Bug: 232048835
Test: FrameworksNetTests CtsNetTestCases
Change-Id: I850f155a01c309f9d75f5143dc0a46a1505415bd
2022-11-22 09:18:44 +00:00
Remi NGUYEN VAN
802f036eea Merge "Wait for launcher is shown after calling pressHome" am: a814e9c364
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301493

Change-Id: I6d58647b1657fa086c9c6bbaf95ac4297b4a003c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 07:48:07 +00:00
Paul Hu
51f816be4a Deal with permission update on handler thread
To ensure that permission cannot change while CS is doing works,
scoring networks, sending callbacks, etc. So making all
permission update are running on handler thread.

Bug: 232048835
Test: FrameworksNetTests CtsNetTestCases
Change-Id: I5380ec8ff1282a1056d9063848e0fff8b3a570ec
2022-11-22 07:18:36 +00:00
Paul Hu
3c8c810110 Running PermissionMonitor#startMonitoring on handler thread
Most permission update functions are running on the handler
thread. So the startMonitoring() should be running on handler
thread as well to ensure the permission won't change while
processing CS's works.

However, startMonitoring() has a dependency with
MultipathPolicyTracker. It needs to call and complete the
permission update before calling MultipathPolicyTracker#start.
Thus, we need to check the startMonitoring done in the end of
systemReadyInternal because we are processing it on the handler
thread.

Bug: 232048835
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I41fef14d6c163eb5676eab3ccd43416ea1fe1414
2022-11-22 07:08:05 +00:00
Remi NGUYEN VAN
a814e9c364 Merge "Wait for launcher is shown after calling pressHome" 2022-11-22 07:06:16 +00:00
Patrick Rohr
ff79fb5646 Merge changes I12916061,I410f0532,I90b6f7f1 am: 41df7f99bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2309355

Change-Id: I9248d2e505793487fd7d470c251e829547c712a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 04:18:15 +00:00
Patrick Rohr
41df7f99bb Merge changes I12916061,I410f0532,I90b6f7f1
* changes:
  gn2bp: Add `-Wno-null-pointer-subtraction` to the default flags
  gn2bp: Add genrules to their respective architecture sink
  gn2bp: Generate per-architecture genrule for `action_foreach`
2022-11-22 04:03:34 +00:00
Maciej Żenczykowski
98cb8d9958 Merge "bpf netd.c - switch from 'int direction' to 'bool egress'" am: d0c03cf20f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2309129

Change-Id: Id2b77529e6ff0452855582178c1b91f6ba9bfa0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 21:08:12 +00:00
Maciej Żenczykowski
d0c03cf20f Merge "bpf netd.c - switch from 'int direction' to 'bool egress'" 2022-11-21 20:29:40 +00:00
Maciej Żenczykowski
55474984e8 bpf netd.c - switch from 'int direction' to 'bool egress'
and get rid of some macros while we're at it.

This is just slightly easier to read.

(side note: this is all resolved at compile time!)

Bug: 259199087
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7b38afd4b6f9d73b4f34a90040639f0780544ac8
2022-11-21 16:53:38 +00:00
Mohannad Farrag
54d5244132 gn2bp: Add -Wno-null-pointer-subtraction to the default flags
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I129160617c30b977a39400a91d10ab8a5e61cb8f
2022-11-21 16:27:02 +00:00
Mohannad Farrag
631443ef83 gn2bp: Add genrules to their respective architecture sink
Test: m cronet_aml_base_base
Change-Id: I410f05320bdb12a070154fbfc004ea2ce9b1343b
2022-11-21 16:17:01 +00:00
Mohannad Farrag
d7efd7b9c5 gn2bp: Generate per-architecture genrule for action_foreach
Test: m cronet_aml_base_base
Change-Id: I90b6f7f105e870aac24f829358cc78b927e8eb7a
2022-11-21 16:15:16 +00:00
Mohannad Farrag
f9faabb5e9 Merge changes I6025abba,I7788a6bb,I4fe381a2,Ib1ee183e,Ifb8843aa, ... am: 293ea35b75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2310088

Change-Id: Idd12bcae436d84e20662449caa77a4e29873303b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 14:46:57 +00:00
Mohannad Farrag
293ea35b75 Merge changes I6025abba,I7788a6bb,I4fe381a2,Ib1ee183e,Ifb8843aa, ...
* changes:
  gn2bp: create one action per arch
  gn2bp: support multiple jni registration modules
  gn2bp: get rid of local_include_dir hacks
  gn2bp: remove jni_headers from jni_generator genrule
  gn2bp: add common header dependencies to defaults
  gn2bp: unconditionally remove -DANDROID for all host targets
2022-11-21 14:08:15 +00:00
Maciej Żenczykowski
8b4c41e90c bpf netd.c - add a TODO am: 1b7c1f1c97
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2310566

Change-Id: I08a0ed914eeac5b1508f78d176e3bd34fddb30de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 13:23:33 +00:00
Aaron Huang
2c07b827e7 Wait for launcher is shown after calling pressHome
In current code, the test will call pressHome before show
network notification but it does not verify the home screen
is shown. The test might be failed due to the notification
shade is still opened. Thus adding an assertion to verify
the launcher is shown.

Bug: 255643296
Test: FrameworksNetTest:NetworkNotificationManagerTest
Change-Id: Iee3476a26030b9ba72994dee624e0e6974c9369f
2022-11-21 10:47:58 +00:00
Maciej Żenczykowski
ce624ba364 Merge "bpf clatd.c - per RFC 6145 simply use bottom 16 bits of IPv6 frag id." am: 0adec97ca7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2309386

Change-Id: I0f6f6583686ee85b8a6aa9a846a393ef3bb8b165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 09:44:11 +00:00
Maciej Żenczykowski
1b7c1f1c97 bpf netd.c - add a TODO
Bug: 259889995
Test: N/A, comment only
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0511433663738550b556208c140b08f76ca7898b
2022-11-21 09:41:33 +00:00
Maciej Żenczykowski
0adec97ca7 Merge "bpf clatd.c - per RFC 6145 simply use bottom 16 bits of IPv6 frag id." 2022-11-21 09:16:08 +00:00
Maciej Żenczykowski
a19f4afa27 bpf netd.c - refactor skip_owner_match() tcp flag processing am: 3621cbddf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2309469

Change-Id: I6071f586b9e45cf1946086dd552b7bb6cd608baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 00:13:21 +00:00
Maciej Żenczykowski
3621cbddf1 bpf netd.c - refactor skip_owner_match() tcp flag processing
(no-op simplification)

Bug: 259199087
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib9e126f1ca84f60b4057ccbbd0071f9684b20b92
2022-11-20 13:48:24 +00:00
Patrick Rohr
98600687ec gn2bp: create one action per arch
Action modules can have different args depending on target_cpu
(specifically, the buildflags action). Therefore, we create one action
per target os & arch.

Test: //components/cronet/android:cronet
Change-Id: I6025abba8eb9f1974ef0fa6b62f79998305374a3
2022-11-18 19:29:18 -08:00
Patrick Rohr
6ef2272edd gn2bp: support multiple jni registration modules
My next change will start appending ARCH to module names, so this
function needs to support multiple jni registration modules.

Test: //components/cronet/android:cronet
Change-Id: I7788a6bbd8807e527f2e1c6981b5f6219eea9a45
2022-11-18 18:24:01 -08:00
Patrick Rohr
3cd5ffb288 gn2bp: get rid of local_include_dir hacks
Those should not be needed anymore, as we are using glibc and bionic
headers, not the chromium packaged sysroot.

Test: //components/cronet/android:cronet
Change-Id: I4fe381a2aa1bb35857e70f90b283895dc7f570e2
2022-11-18 17:40:55 -08:00
Patrick Rohr
59e45bb3bf gn2bp: remove jni_headers from jni_generator genrule
jni_headers are now globally included in defaults.

Test: //components/cronet/android:cronet
Change-Id: Ib1ee183eb556c8144713f7df26270b2df6ee12f9
2022-11-18 17:33:32 -08:00
Patrick Rohr
c03f1bb1d6 gn2bp: add common header dependencies to defaults
Chromium builds get these headers directly from sysroot, so they do
not explicitly list the dependency. While this is probably an upstream
bug (or at least a limitation), it is easiest to just add them to
cc_defaults.

This also adds jni_headers which are required by multiple targets.

Test: //components/cronet/android:cronet
Change-Id: Ifb8843aaa60b2454544886b3e60aae42f9a5388e
2022-11-18 17:32:50 -08:00
Patrick Rohr
5446df8d33 gn2bp: unconditionally remove -DANDROID for all host targets
It turns out, -DANDROID was not consistently applied across the chromium
code base, so it was removed for some targets where it shouldn't have
been.
Adding it to the host defaults solves this problem.

Test: //components/android/cronet:cronet
Change-Id: Ieff81727410c47a0d90d22b56348c6773f653a25
2022-11-18 14:57:41 -08:00
Mohannad Farrag
4cb57c3a14 gn2bp: Add -UANDROID for host supported targets am: 97b4eeddab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2309568

Change-Id: I42a1869656ea04f128bfecfbe27aee434962258d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 20:04:36 +00:00
Mohannad Farrag
97b4eeddab gn2bp: Add -UANDROID for host supported targets
* Base now builds under multi-architectures.

Test: m cronet_aml_base_base
Change-Id: Ia672c79c51763d43258510c5e63eb609e465bfba
2022-11-18 19:04:30 +00:00
Patrick Rohr
4b35f948c7 Merge "gn2bp: Use AOSP libc and NDK" am: 592958fa2c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2309567

Change-Id: Icd9863397882112165298670664d970dc48bbfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 18:45:51 +00:00
Patrick Rohr
592958fa2c Merge "gn2bp: Use AOSP libc and NDK" 2022-11-18 18:10:43 +00:00
Mohannad Farrag
06e2b648ed gn2bp: Use AOSP libc and NDK
* Deleted the dependency on chromium libc and Android NDK.
* This is a tweak for an upstream problem as libbase has a dependency on libmedia without declaring it.

Change-Id: I77655b8d550a51d256d9b33c07d6eb69971f3811
Test: m cronet_aml_base_base
2022-11-18 17:54:26 +00:00
Patrick Rohr
2af2ae8168 TestNetworkInterface: improve documentation of newly added methods
This change addresses API review feedback and improves documentation.
Specifically, it adds documentation for the newly added getMtu() and
getMacAddress() methods, describes under which conditions the MAC
address is null and adds a short blurb on how (or in what context) this
class is used.

Test: TH
Bug: 236187143
Change-Id: I349897fd55f3085ce88c8b94c84ec636bb5eb2a6
2022-11-18 09:44:30 -08:00
Maciej Żenczykowski
e6b4ec5b29 bpf clatd.c - per RFC 6145 simply use bottom 16 bits of IPv6 frag id.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifac9ae3702b0fc54a02fcfcf05efb36c1299e8ec
2022-11-18 15:00:03 +00:00
Treehugger Robot
56f12dc5bc Merge "Reinstate sleep pending better fix" am: 61845d0b10
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308847

Change-Id: I326d4632c679caabd379c2606c7fd0e49c3661ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 14:17:29 +00:00
Treehugger Robot
61845d0b10 Merge "Reinstate sleep pending better fix" 2022-11-18 13:59:50 +00:00
Treehugger Robot
9248d8de90 Merge "Refactor CarrierPrivilegeAuthenticatorTest" am: adb9c9e83a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301605

Change-Id: Iea7903ab16791547954d9d8381adf0b226a67468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 12:32:49 +00:00
Treehugger Robot
adb9c9e83a Merge "Refactor CarrierPrivilegeAuthenticatorTest" 2022-11-18 12:05:53 +00:00
Motomu Utsumi
ed4370a48a gn2bp: Skip extracting common part for source_set am: 5539463ed1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308857

Change-Id: If1dffae650fd6acf6604201e8b5d46694bb91ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:35 +00:00
Motomu Utsumi
3394ec398f gn2bp: Add desc_x86.json to update_results.sh am: 6550118309
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308856

Change-Id: Icd034dc143ebc4d1df4af22fd2003f88a338783d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:32 +00:00
Motomu Utsumi
46a2574e48 gn2bp: Support multiple desc files am: 879dec819d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308855

Change-Id: Ic7b04c4f2bdf3f3208201f0945d5cb6b669e785c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:30 +00:00
Motomu Utsumi
4029f2d60a gn2bp: Remove desc from the arg of create_blueprint_for_targets am: a71281cd12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308854

Change-Id: Ib7da6d869dbddf5665354150e29470401d3be352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:28 +00:00
Motomu Utsumi
5f518261b3 gn2bp: add desc_arm.json am: 7a122f52b3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2308853

Change-Id: Ifcd23f44f0688839d234442171b6e707dc6112bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-18 11:37:26 +00:00