Paul Hu
80804587f2
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 2933a04749 am: 6f9bce51aa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92
2020-08-03 11:18:31 +00:00
Paul Hu
6f9bce51aa
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 2933a04749
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: I54758c3e9ec37c68d45360afb10a322f749564a9
2020-08-03 10:56:42 +00:00
Paul Hu
2933a04749
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method"
2020-08-03 10:37:52 +00:00
Peter Wang
a4903ada1e
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: c80aabbd2e am: 1cd92f18b3 -s ours
...
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
2020-07-31 09:34:47 +00:00
Peter Wang
1cd92f18b3
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: c80aabbd2e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a
2020-07-31 09:04:43 +00:00
Peter Wang
c80aabbd2e
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission"
2020-07-31 08:43:44 +00:00
Chalard Jean
f438cf39b7
Merge "Move utils from network stack to libs." am: 21be4fabb5 am: 64573a945a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
2020-07-31 01:09:46 +00:00
Chalard Jean
64573a945a
Merge "Move utils from network stack to libs." am: 21be4fabb5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I846dae9b7e36ddf6360bb946cc07beb8c44a34a5
2020-07-31 00:53:12 +00:00
Chalard Jean
3b7591e1f5
Move utils from network stack to libs.
...
This package is using some common utilities from
a library that used to live in the network stack.
A better home for these utilities is frameworks/libs,
so this topic moves the files ther and also changes
the package of some utilities.
See aosp/1350222 and aosp/1350182 for a detailed
description of the specific files that moved.
Test: checkbuild
Change-Id: I76a9b7790f3997e3e6b3c2f75ba6308286457cde
2020-07-29 21:15:48 +09:00
paulhu
de5b46c10b
[RFPM04] Adjust hasRestrictedNetworkPermission method
...
There are two parts in hasRestrictedNetworkPermission method.
One is carryover package check and one is uid permission
check. Seperate carryover package check part to another method
to be clearer the usage of hasRestrictedNetworkPermission method.
Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: Iab0609fcaa52acb0dfcb31ca957f22bfe8d62392
2020-07-29 14:14:27 +08:00
Paul Hu
8fdd2ff899
Merge "[RFPM03] Check permission by uid." am: 563de5b8c7 am: 77cba9c18e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I80406643e4797b1e269b4f7c5711339371fa533b
2020-07-29 05:53:25 +00:00
Paul Hu
77cba9c18e
Merge "[RFPM03] Check permission by uid." am: 563de5b8c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I520b5d271d6d5214653ebaaeb5d6713c191b911d
2020-07-29 05:47:15 +00:00
Paul Hu
563de5b8c7
Merge "[RFPM03] Check permission by uid."
2020-07-29 05:41:32 +00:00
Junyu Lai
ca54fa5a5c
Merge "Gracefully handle integer overflows." am: cdb1f03144 am: fe6c5793ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408
2020-07-29 01:55:23 +00:00
Junyu Lai
fe6c5793ce
Merge "Gracefully handle integer overflows." am: cdb1f03144
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I779298886cfaef330b433fea6009860682df35bd
2020-07-29 01:37:48 +00:00
Junyu Lai
cdb1f03144
Merge "Gracefully handle integer overflows."
2020-07-29 01:19:07 +00:00
Lorenzo Colitti
fddfe676fd
Set the NetworkInfo subtype to 0. am: fd43392b25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: Ida8cd0788ae34f4861fbcb958163b5074258c6ac
2020-07-28 18:05:15 +00:00
Chiachang Wang
6d70190fcd
Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf am: ef723b7617
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
2020-07-28 11:19:47 +00:00
Chiachang Wang
ef723b7617
Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: Ifcb4682d75b8df577281030c58b61eff53e6ae20
2020-07-28 11:04:20 +00:00
Chiachang Wang
f702025bdf
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-28 10:51:53 +00:00
paulhu
8adb39a688
[RFPM03] Check permission by uid.
...
PermissionMonitor check permission by each package name but only
update the uid permission to netd. It's better to check
permission by uid directly. Thus, use
ActivityManager#checkUidPermission to check permissions for each
uid.
Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I057d34383b4dc408b2773e4c6b146774ba0c5eb2
2020-07-28 18:23:38 +08:00
Lorenzo Colitti
fd43392b25
Set the NetworkInfo subtype to 0.
...
For non-telephony networks, this was always set to 0 before R.
In R, it is currently set to the same value as the network type.
This is incorrect because the two have different namespaces.
or example, currently, any network of type WIFI (==1) will have
a subtype of NETWORK_TYPE_GPRS (==1). Similarly, all ETHERNET
networks will have subtype NETWORK_TYPE_1XRTT, all VPN networks
will have a subtype of NETWORK_TYPE_TD_SCDMA, etd.
Bug: 161653721
Test: builds, boots
Change-Id: I07e111c1762e0021c931cefc27f193f78578748b
2020-07-28 09:20:19 +00:00
Chiachang Wang
3b9549f408
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Bug: 161896447
Test: m
Change-Id: I6c3c03c0c2d1302af6d5245486823c13a3432900
2020-07-28 15:36:30 +08:00
Pavan Kumar M
e55ab87e5d
Gracefully handle integer overflows.
...
Avoid recording negative data by doing integer-based
math as much as possible, but switch to double-based
math if we detect that we'd end up causing an overflow.
Test :
- Builds, Boots
- High data throughput scenarios
- NetworkStatsHistoryTest, NetworkStatsCollectionTest,
NetworkStatsTest
Bug: 119527458
Change-Id: I55d4aa649bea3ae201ad513074ff2b71cb918dad
2020-07-28 11:36:49 +05:30
Aaron Huang
8f98e732a0
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
2020-07-17 06:05:38 +00:00
Aaron Huang
5463bbece5
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: Ib3e7b1ff5c2fbe3fd9a049b58faf26a6c355ad8f
2020-07-17 05:53:43 +00:00
Aaron Huang
c36f17d32e
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)"
2020-07-17 05:40:31 +00:00
junyulai
fbb36e7d8e
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I7e48e1b94107d84a1b828b005437ad2e24a92850
2020-07-17 04:03:35 +00:00
Treehugger Robot
dc4c9d51a1
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673 am: 0c55907a0a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Idef0dd6e0e0486b76c0067540e580d444e97d6a0
2020-07-16 12:09:04 +00:00
Treehugger Robot
0c55907a0a
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I74242ad8ffae7aa7bcf0562eee577d7f66747f09
2020-07-16 11:57:03 +00:00
Treehugger Robot
0ac564e673
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode"
2020-07-16 11:43:51 +00:00
junyulai
c3e3a1d0ef
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
1041764067
[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
2774832382
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
a3d509537c
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: ce769a0d8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
2020-07-10 05:41:05 +00:00
Treehugger Robot
ce769a0d8e
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I0b5da0e4e20cbd2dd5856b04d1f1ddfe3323b10b
2020-07-10 05:26:41 +00:00
Chalard Jean
9816816837
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ded38fda42 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: Ie9e902ce58b8c6641967c8c6a4fa74cefcf49ab1
2020-07-10 05:00:57 +00:00
Junyu Lai
43b3142dc3
Revert "Attribute data usage to 5G for 5G non-standalone mode"
...
This reverts commit dc31686c31 .
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
7249a46c8e
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: 214280263e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I860b0226157ee31f0488d6b2252ae157e86dc5eb
2020-07-10 03:10:15 +00:00
Junyu Lai
214280263e
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I89ed9dd80f6b30e43e59d91fdd3fb91fb0e9be45
2020-07-10 02:56:44 +00:00
junyulai
dc31686c31
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
Paul Hu
99670e6e0c
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934 am: 9778855eb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: If53e1521327c8d9f1fd2a5debb94c58ed25b2880
2020-07-08 10:35:21 +00:00
Paul Hu
9778855eb6
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: Ibc81b90c9a7428f63afcb6bad27eb593cf2f628e
2020-07-08 10:24:36 +00:00
Paul Hu
27cba24934
Merge "[RFPM02] Add Dependencies class for injection in tests."
2020-07-08 10:07:23 +00:00
Chalard Jean
9aa3127449
Add some more public doc for MacAddress
...
Bug: 140807677
Test: doc-only change
Original-Change: https://android-review.googlesource.com/1354447
Merged-In: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
2020-07-08 09:38:37 +00:00
paulhu
a1a8814b82
[RFPM02] Add Dependencies class for injection in tests.
...
Add Dependencies class in PermissionMonitor for injection
in tests easily.
Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ibb84d548908f7a955fa0ff206794486733259978
2020-07-08 15:30:42 +08:00
Chalard Jean
074d5a8e8a
Merge "Add some more public doc for MacAddress" am: a9c0a7e2e2 am: 3b3c6ffdc2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I5c9061fa832c75c9e0476c54bacec3deb114a96d
2020-07-08 05:38:59 +00:00
Chalard Jean
3b3c6ffdc2
Merge "Add some more public doc for MacAddress" am: a9c0a7e2e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I1126b78eb886c5c84afa107b028fe2569d7573e4
2020-07-08 05:29:56 +00:00
Chalard Jean
a9c0a7e2e2
Merge "Add some more public doc for MacAddress"
2020-07-08 05:15:20 +00:00
Aaron Huang
ffb76492e0
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