Commit Graph

2898 Commits

Author SHA1 Message Date
android-build-team Robot
30eac99496 Snap for 6617762 from 7bf84ecb6a5ae5833891a6b90a221ed99294e6bb to rvc-release
Change-Id: I2601dfb3a00cd1fe368ae543efec586de69fba64
2020-06-23 01:07:43 +00:00
Michael Groover
da9c8d3049 Merge "Update docs for methods that require subscriberId" into rvc-dev am: 3e045d41e1 am: c356bf7394 am: 709eec20bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932150

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

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

Change-Id: Iac86f4af0953a45eb934e64e01ced4bad153aac9
2020-06-22 19:50:37 +00: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
56169afda7 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: If66a3a8f31b4f7a2d3e8c9a627dfe33270126361
2020-06-22 19:31:40 +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
101911a85a Merge "Address comments from aosp/1298476" am: 72b4ffad5c am: eb276cb5b3 am: e9d35cc556 am: 15156482c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340040

Change-Id: I067965de3d884bfe8f2832e5116daadd5bda1ae5
2020-06-18 11:06:40 +00: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
eb43ef0c07 Merge "Dynamically enable/disable watch for RAT type changes" am: 04baaeb973 am: abc4648d47 am: eb1a7159b0 am: 17f6c1ba40
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1315574

Change-Id: I61d7242d2c597e680953d2603b0b54962dd749b3
2020-06-18 04:40:20 +00: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
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