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

2404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
junyulai
3e1d718c12 Attribute data usage to virtual RAT type for 5G non-standalone mode 
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
 2020-07-16 18:22:09 +08:00
Peter Wang
171598cb7c [Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and 
guard with permission

Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586
 2020-07-16 02:01:06 -07:00
junyulai
fba76f64a6 Attribute data usage to virtual RAT type for 5G non-standalone mode 
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
 2020-07-16 15:33:35 +08:00
Treehugger Robot
e03153276d Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: 56df7e2c1a am: 69b5a78282 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157

Change-Id: I76f64267c5cbe4516602f8526d6f8fee452c46bb
 2020-07-10 05:51:55 +00:00
Treehugger Robot
69b5a78282 Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: 56df7e2c1a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157

Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
 2020-07-10 05:41:05 +00:00
Junyu Lai
491d1837e9 Revert "Attribute data usage to 5G for 5G non-standalone mode" 
This reverts commit 7e5b9894a4.

Reason for revert: Revert and wait for the design is settled down.

Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810
 2020-07-10 03:43:19 +00:00
Junyu Lai
ce0762faa5 Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: b2cd1cf130 am: d3dda13a8c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203

Change-Id: I845221848bb00355db98f0aa5a4341641e3ceec7
 2020-07-10 03:21:43 +00:00
Junyu Lai
d3dda13a8c Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: b2cd1cf130 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203

Change-Id: I860b0226157ee31f0488d6b2252ae157e86dc5eb
 2020-07-10 03:10:15 +00:00
junyulai
7e5b9894a4 Attribute data usage to 5G for 5G non-standalone mode 
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498

Change-Id: I563df14500caeb3602b381479afaf5163ad8e6a1
 2020-07-09 16:56:54 +08:00
Aaron Huang
59fc483921 Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri) 
Update all callers to use ProxyInfo(Uri) and remove ProxyInfo(String).

Bug: 160557668
Test: build pass
      atest FrameworksNetTests

Change-Id: I4c980764c8839c48acf03208bb68cd53eb910121
 2020-07-06 11:59:27 +00:00
Treehugger Robot
d70d9d6c2e Merge "ITetheredInterfaceCallback is a oneway interface" am: d29edf9d83 am: 91a7404270 am: 53bd5d206e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354662

Change-Id: If18f53d5b6e74ecbe4b4bab4b88c4ddaa99075db
 2020-07-03 09:58:29 +00:00
Treehugger Robot
53bd5d206e Merge "ITetheredInterfaceCallback is a oneway interface" am: d29edf9d83 am: 91a7404270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354662

Change-Id: Id0aae634967288a68cc80d0de79a42ab09c06a59
 2020-07-03 09:43:09 +00:00
Robin Lee
d8c0131468 ITetheredInterfaceCallback is a oneway interface 
This is sent from the system server, and the system server doesn't like
being blocked by apps.

Change-Id: I603be3038831974baf1dc392ff0d062e9db91b63
Test: atest CtsTetheringTest
Bug: 160389275
 2020-07-02 17:59:28 +02:00
Michael Groover
709eec20bd Merge "Update docs for methods that require subscriberId" into rvc-dev am: 3e045d41e1 am: c356bf7394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: I008b859286a4c3153fcf147b6984301aaffc90fd
 2020-06-22 19:43:58 +00:00
Michael Groover
c5e3617d83 Merge "Update docs for methods that require subscriberId" into rvc-dev am: 3e045d41e1 am: 4e232b3775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: I6046d622c7d87d246afb670cd57983c612f5c3ab
 2020-06-22 19:39:42 +00:00
Michael Groover
4e232b3775 Merge "Update docs for methods that require subscriberId" into rvc-dev am: 3e045d41e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: I310f0ac101c670b251a3cbf07408d3d7033d72c5
 2020-06-22 19:31:46 +00:00
Michael Groover
c356bf7394 Merge "Update docs for methods that require subscriberId" into rvc-dev am: 3e045d41e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

Change-Id: I627d3015c0e2cad832a8fd9926fc2079241bd9cd
 2020-06-22 19:31:31 +00:00
Michael Groover
3e045d41e1 Merge "Update docs for methods that require subscriberId" into rvc-dev 2020-06-22 19:30:10 +00:00
Michael Groover
3dae8b1b41 Update docs for methods that require subscriberId 
In Android 10 additional restrictions were required to access the
subscriberId. The NetworkStatsManager has several methods that accept
a subscriberId of the mobile network for which usage should be queried.
This commit updates the docs for these methods to reference the new
access restrictions and offer null as an option to obtain the usage
for all mobile networks.

Fixes: 157871064
Test: m docs
Change-Id: I95c730c9418fced6312eb3ba4e0d69e6299f3ded
 2020-06-19 19:48:07 -07:00
Aaron Huang
15156482c4 Merge "Address comments from aosp/1298476" am: 72b4ffad5c am: eb276cb5b3 am: e9d35cc556 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I8557b955af2d28122054df5236a38543523909f4
 2020-06-18 10:49:25 +00:00
Aaron Huang
e9d35cc556 Merge "Address comments from aosp/1298476" am: 72b4ffad5c am: eb276cb5b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I7b119758ac7cd65defdec77692957287af17566d
 2020-06-18 10:47:47 +00:00
Aaron Huang
72b4ffad5c Merge "Address comments from aosp/1298476" 2020-06-18 10:18:57 +00:00
Aaron Huang
cf854996a6 Address comments from aosp/1298476 
This patch addresses the followings,
- Pass Looper to NetworkStatsSubscriptionsMonitor constructor
- Replace Looper with TestLooper in unit test
- Assert fail if result of condition check is not expected.

Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsServiceTest
      atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Change-Id: Ibcaba2b38af80cc0ec9a4e428a3b3a1538bc4325
 2020-06-18 15:05:19 +08:00
Aaron Huang
17f6c1ba40 Merge "Dynamically enable/disable watch for RAT type changes" am: 04baaeb973 am: abc4648d47 am: eb1a7159b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315574

Change-Id: I5e607bb44b2e97c01da9f9dcc0e89687bd08130f
 2020-06-18 04:23:10 +00:00
Aaron Huang
eb1a7159b0 Merge "Dynamically enable/disable watch for RAT type changes" am: 04baaeb973 am: abc4648d47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315574

Change-Id: I5a96774ad2104a6b03c9abab2b105b97195edea8
 2020-06-18 04:22:21 +00:00
Aaron Huang
04baaeb973 Merge "Dynamically enable/disable watch for RAT type changes" 2020-06-18 03:51:51 +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
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
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
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
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
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
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
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