LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,829 Commits 2 Branches 0 Tags
24f46aaa90a360f3574a26da7f99c31c170e82ba
Commit Graph

2829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Huang
04baaeb973 Merge "Dynamically enable/disable watch for RAT type changes" 2020-06-18 03:51:51 +00:00
Aaron Huang
bcb2dd2f92 [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 am: 4535e1ddca -s ours am: 2d1e20a07b -s ours am: d471d2ab2b -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 da12e7f732 is in history

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

Change-Id: I03cc7680a5a57f16862792351ddae20acd66167a
 2020-06-17 09:47:28 +00:00
Aaron Huang
d471d2ab2b [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 am: 4535e1ddca -s ours am: 2d1e20a07b -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 da12e7f732 is in history

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

Change-Id: I2058092be5426269fc93e209517a0d01c2fab1ec
 2020-06-17 09:34:01 +00:00
Aaron Huang
2d1e20a07b [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: ad9a0e7713 am: 4535e1ddca -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 da12e7f732 is in history

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

Change-Id: I11b25c0832d6959e77bbabbfce53cdedce922279
 2020-06-17 09:21:52 +00:00
Aaron Huang
e436804466 Dynamically enable/disable watch for RAT type changes 
Add ContentObserver to observe the status of
NETSTATS_COMBINE_SUBTYPE_ENABLED to determine that
NetworkStatsSubscriptionsMonitor start or stop
monitoring data usage per RAT type changes.

Bug: 154080515
Test: atest NetworkStatsServiceTest#testDynamicWatchForNetworkRatTypeChanges
Change-Id: I272d589633c9186b45753228b05aa0b40b7c7b89
 2020-06-17 17:09:10 +09:00
Aaron Huang
86bb429959 Add unit test for NetworkStatsSubscriptionsMonitor 
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
(copy from ag/11788484 but getActiveAndHiddenSubscriptionIdList() since it's renamed
in internal)
Change-Id: Ia162f36efe96d90b2f6f70190d9fa855bba34484
Merged-In: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
 2020-06-15 07:05:19 +00:00
android-build-team Robot
da8a65a11b Snap for 6586393 from a840c1f3ea1e9c3cde2ee985212f80864ff1e8d7 to rvc-release 
Change-Id: I2ee507de15484671c09c996a38d5a0a47564658e
 2020-06-13 01:09:12 +00:00
android-build-team Robot
d65875a707 Make change and version bump to r_aml_300801400 for mainline module file: packages/Tethering/apex/manifest.json 
Change-Id: I9c9f527416459b38c32ccf5b65f4054cea5b586f
 2020-06-12 07:21:50 +00:00
Automerger Merge Worker
de1f329521 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: 2ef30014fe" into rvc-d1-dev-plus-aosp am: 3f9d8e9c90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I65a8db74593d794c6efba6b70ae5e575cfce25d1
 2020-06-12 02:32:20 +00:00
Automerger Merge Worker
a961408b1f Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: d6758e2643 am: 595ce6d456" into rvc-qpr-dev-plus-aosp 2020-06-12 02:31:40 +00:00
Aaron Huang
ddfa3ef0d6 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: d6758e2643 am: 2acbd72f5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I643f27dda377ee5d2fa885cac8b814445363a20d
 2020-06-12 02:31:29 +00:00
Aaron Huang
027c8bcd16 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: d6758e2643 am: 595ce6d456 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I48486d88ee3fa4b81af8e82203d2810f118be7c2
 2020-06-12 02:31:20 +00:00
Automerger Merge Worker
3f9d8e9c90 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: 2ef30014fe" into rvc-d1-dev-plus-aosp 2020-06-12 02:20:40 +00:00
Aaron Huang
0f4a77797c Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: 2ef30014fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I0e5b064f0633474c5200ecf4620540e883af5d0b
 2020-06-12 02:20:15 +00:00
Aaron Huang
595ce6d456 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 am: d6758e2643 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I7c557b81d3e5ac35b7e8559d8f5d4f5e0d29236a
 2020-06-12 02:19:55 +00:00
Aaron Huang
d6758e2643 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I43328c82223382978ac3475a195011547f6d0fdc
 2020-06-12 02:11:58 +00:00
Aaron Huang
8bab3c3984 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I147966b0b3480b44fa89aafd652ecfef8d68339b
 2020-06-12 02:11:31 +00:00
Aaron Huang
2ef30014fe Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: Iac633487b359d751206e06b2352a2a9cb475811e
 2020-06-12 02:11:29 +00:00
Aaron Huang
da12e7f732 Add unit test for NetworkStatsSubscriptionsMonitor 
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Change-Id: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
 2020-06-09 00:40:36 +08:00
android-build-team Robot
76fc5cf8e0 Snap for 6539570 from b04b04a849eac3c27464bc76d16909fad37bedf5 to mainline-release 
Change-Id: I03a57a5f17ac6753aba6153ceb0548dd31d017c7
 2020-05-29 07:02:51 +00:00
android-build-team Robot
f8e63dc156 Snap for 6538416 from 4911db037b82a92a30c0bed2ce01b7516c4f414a to rvc-release 
Change-Id: I4f4c4465f8c042839083209d51b523e41d30f896
 2020-05-29 01:02:11 +00:00
TreeHugger Robot
29a9ea8ec4 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 am: baf5cf8020 -s ours am: 0f416b3cf1 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 9d862381bb is in history

Change-Id: I40af096b41db07aa93267e83486e2a0a2aafc04e
 2020-05-28 21:48:59 +00:00
Maciej Żenczykowski
95be5e4b29 [automerger skipped] NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: c7d0224c75 am: 27799a5019 -s ours am: bee7490350 -s ours 
am skip reason: Change-Id I0121a4ac7ee824adc5930bab786d550b2f00b05b with SHA-1 c7d0224c75 is in history

Change-Id: Ic90310014129ae981a40439bee9ac63f01a7700a
 2020-05-28 21:48:56 +00:00
Maciej Żenczykowski
1aad9cb3ee [automerger skipped] NetworkStats - no need for xt_qtaguid clat bw fixups am: 5c9097c9e0 am: e587c77c4b -s ours am: c76415b234 -s ours 
am skip reason: Change-Id Ia171b7797cdc99367064d0649bf1293c71579941 with SHA-1 5c9097c9e0 is in history

Change-Id: I38a3b008d77ef4a208960b74d1d2318e0d90c4e3
 2020-05-28 21:48:40 +00:00
TreeHugger Robot
0f416b3cf1 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 am: baf5cf8020 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 9d862381bb is in history

Change-Id: Ie4ef1dcf72a003b1b2427bcaa759b1ee859db83c
 2020-05-28 21:35:55 +00:00
Maciej Żenczykowski
bee7490350 [automerger skipped] NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: c7d0224c75 am: 27799a5019 -s ours 
am skip reason: Change-Id I0121a4ac7ee824adc5930bab786d550b2f00b05b with SHA-1 c7d0224c75 is in history

Change-Id: Id17c744ef0e967217c297d86c5296d4b450e2e8e
 2020-05-28 21:35:52 +00:00
Maciej Żenczykowski
c76415b234 [automerger skipped] NetworkStats - no need for xt_qtaguid clat bw fixups am: 5c9097c9e0 am: e587c77c4b -s ours 
am skip reason: Change-Id Ia171b7797cdc99367064d0649bf1293c71579941 with SHA-1 5c9097c9e0 is in history

Change-Id: I7ce328aa8cacaec55e782257c645249be83878c3
 2020-05-28 21:35:16 +00:00
TreeHugger Robot
baf5cf8020 Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 
Change-Id: Iec9a061d0f91993e65c5d110955e8f23b0f0d945
 2020-05-28 21:28:28 +00:00
Maciej Żenczykowski
27799a5019 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: c7d0224c75 
Change-Id: Ibaee70f31f27f7457bd8524d4ab62bc76fff5dea
 2020-05-28 21:28:25 +00:00
Maciej Żenczykowski
e587c77c4b NetworkStats - no need for xt_qtaguid clat bw fixups am: 5c9097c9e0 
Change-Id: I2f9cdc700f19f9cb87515cbe4b0718f5cb0bdf6a
 2020-05-28 21:28:07 +00:00
TreeHugger Robot
c69452bb17 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: 9b4412d7f4 -s ours am: d475d6070b -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 e454f35a39 is in history

Change-Id: I9600de066578322aed052b74960f122f0f8ca3e1
 2020-05-28 14:18:34 +00:00
TreeHugger Robot
d475d6070b [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours am: 9b4412d7f4 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 e454f35a39 is in history

Change-Id: I308d86910c877702cda6d0f3093c66700c68a862
 2020-05-28 13:59:38 +00:00
TreeHugger Robot
d33c271515 Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 
Change-Id: I22e6b323c80aea7e240872d23d920c851492cd17
 2020-05-28 13:33:41 +00:00
Maciej Żenczykowski
dfb05e9fc3 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. am: c7d0224c75 
Change-Id: Ic80dd8ce332802dc28d3c1db8ecb8359d3f844ad
 2020-05-28 13:33:39 +00:00
Maciej Żenczykowski
9c1a8a23d1 NetworkStats - no need for xt_qtaguid clat bw fixups am: 5c9097c9e0 
Change-Id: Id43e200e60590222e15327f3220de1f99e94f11c
 2020-05-28 13:33:28 +00:00
TreeHugger Robot
9b4412d7f4 [automerger skipped] Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 -s ours 
am skip reason: Change-Id I289d935f84b616ed857ef4c5a7427d57c282d00c with SHA-1 e454f35a39 is in history

Change-Id: I9e2e5b2862a2a381c437669427c0ef02a3905dc4
 2020-05-28 13:31:18 +00:00
Treehugger Robot
c975d9f7ee Merge changes I289d935f,I0121a4ac am: 8366a33efa am: fc00838335 am: 4d03a1c408 am: ecc69ed44d 
Change-Id: Ic7c83378d11f97b215d315daede35c782bbacdd0
 2020-05-28 11:42:01 +00:00
Treehugger Robot
ecc69ed44d Merge changes I289d935f,I0121a4ac am: 8366a33efa am: fc00838335 am: 4d03a1c408 
Change-Id: Idb0dfe9d6e35ed439a81ed17b2cee6ae030f01f0
 2020-05-28 11:29:35 +00:00
Treehugger Robot
4d03a1c408 Merge changes I289d935f,I0121a4ac am: 8366a33efa am: fc00838335 
Change-Id: If3c25f5a373e96fc007698ad2c5cdef5af92804a
 2020-05-28 11:08:56 +00:00
Treehugger Robot
fc00838335 Merge changes I289d935f,I0121a4ac am: 8366a33efa 
Change-Id: I7c413c9e1f2efc3aba55453c6b98bf682f3d4116
 2020-05-28 10:55:48 +00:00
Treehugger Robot
8366a33efa Merge changes I289d935f,I0121a4ac 
* changes:
  NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID
  NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter.
 2020-05-28 10:34:01 +00:00
Maciej Żenczykowski
164eee7cf5 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 am: fc30c1b04b am: ae83907ce4 
Change-Id: I003400462b333c378b1e1a2e3a3a8f57a691a5cb
 2020-05-28 10:13:38 +00:00
Maciej Żenczykowski
ae83907ce4 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 am: fc30c1b04b 
Change-Id: Ifb85b0402528da09f4d98939b4e365df010762c7
 2020-05-28 09:51:22 +00:00
Maciej Żenczykowski
9d862381bb NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID 
This should no longer be needed after all the cleanups.

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I289d935f84b616ed857ef4c5a7427d57c282d00c
Merged-In: I289d935f84b616ed857ef4c5a7427d57c282d00c
 2020-05-28 02:44:20 -07:00
Maciej Żenczykowski
c7d0224c75 NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter. 
Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0121a4ac7ee824adc5930bab786d550b2f00b05b
Merged-In: I0121a4ac7ee824adc5930bab786d550b2f00b05b
 2020-05-28 02:44:10 -07:00
Maciej Żenczykowski
5c9097c9e0 NetworkStats - no need for xt_qtaguid clat bw fixups 
This is due to the previous addition of the ip6tables raw PREROUTING
drop rules for incoming ipv6 clat traffic pre-translation to ipv4.

Since we no longer double account, we no longer need these fixups.

Test: atest bpf_module_test clatd_test libbpf_android_test libnetdbpf_test
  netd_integration_test netd_unit_test netdutils_test
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia171b7797cdc99367064d0649bf1293c71579941
Merged-In: Ia171b7797cdc99367064d0649bf1293c71579941
 2020-05-28 02:43:22 -07:00
Maciej Żenczykowski
fc30c1b04b Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 am: 394c0003a1 
Change-Id: If8abb4247759462532cbac6b43bfb8d3202c6e34
 2020-05-28 09:36:05 +00:00
Maciej Żenczykowski
394c0003a1 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: 8eb57183e9 
Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1
 2020-05-28 09:18:16 +00:00
Maciej Żenczykowski
8eb57183e9 Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 
* changes:
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
  fix android.net.NetworkStatsTest#testApply464xlatAdjustments
  NetworkStats - no need for xt_qtaguid clat bw fixups
 2020-05-28 09:04:42 +00:00
Maciej Żenczykowski
e454f35a39 NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID 
This should no longer be needed after all the cleanups.

Test: atest NetworkStatsTest NetworkStatsFactoryTest
Bug: 150738490
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I289d935f84b616ed857ef4c5a7427d57c282d00c
 2020-05-28 01:47:30 -07:00