[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 3ca65c6b2b -s ours
...
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 862858dc88 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906
Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f
Alex Light
authored and
Automerger Merge Worker
commited 2020-08-03 21:25:57 +00:00
a67193d103
Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906
Change-Id: Id2829bcdfb836db02db9842bb250e2eb628495aa
Alex Light
authored and
Automerger Merge Worker
commited 2020-08-03 21:01:33 +00:00
3ca65c6b2b
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
Merged-In: I971050a2665c177870ff257bd0f41343db702892
Alex Light
commited 2020-08-03 17:04:58 +00:00
ed78646808
Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fd5ab3e01b am: 19eb130f02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658
Change-Id: I293b49f1061181f07c9affad5922472ddfdf50ad
TreeHugger Robot
authored and
Automerger Merge Worker
commited 2020-08-03 16:41:37 +00:00
07136ca39c
Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fd5ab3e01b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658
Change-Id: I439c446bcd55b35ec41d7c4f76a53e39de5cdd4e
TreeHugger Robot
authored and
Automerger Merge Worker
commited 2020-08-03 16:17:14 +00:00
19eb130f02
Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2020-08-03 15:49:46 +00:00
fd5ab3e01b
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68 am: 715a48b386 am: 0f9b51cb06
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: I564421416ae29ce7ccd7cee19787f8263a862529
Paul Hu
authored and
Automerger Merge Worker
commited 2020-08-03 11:57:37 +00:00
8ac1f7d5de
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68 am: 715a48b386
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: I3a376716eb2e3d25aa60921265ffbe3dc8f093a6
Paul Hu
authored and
Automerger Merge Worker
commited 2020-08-03 11:43:15 +00:00
0f9b51cb06
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8 am: 296741de68
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92
Paul Hu
authored and
Automerger Merge Worker
commited 2020-08-03 11:18:31 +00:00
715a48b386
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321322
Change-Id: I54758c3e9ec37c68d45360afb10a322f749564a9
Paul Hu
authored and
Automerger Merge Worker
commited 2020-08-03 10:56:42 +00:00
296741de68
Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method"
Paul Hu
authored and
Gerrit Code Review
commited 2020-08-03 10:37:52 +00:00
cb4e4712b8
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
Alex Light
commited 2020-07-31 08:18:33 -07:00
862858dc88
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -s ours am: a70fc1011e -s ours am: b85be85697 -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: Ic30f3dc44333a759d86920c5c9d8588d5142eec3
Peter Wang
authored and
Automerger Merge Worker
commited 2020-07-31 10:18:58 +00:00
19d452e8cc
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -s ours am: a70fc1011e -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: Ic15254afce6f13f0553faf9ec98fc16fe9563c81
Peter Wang
authored and
Automerger Merge Worker
commited 2020-07-31 09:55:23 +00:00
b85be85697
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340 am: b882e3f391 -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
Peter Wang
authored and
Automerger Merge Worker
commited 2020-07-31 09:34:47 +00:00
a70fc1011e
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: 617ea90340
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a
Peter Wang
authored and
Automerger Merge Worker
commited 2020-07-31 09:04:43 +00:00
b882e3f391
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission"
Peter Wang
authored and
Gerrit Code Review
commited 2020-07-31 08:43:44 +00:00
617ea90340
Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6 am: 642beae1fd am: 475d83afd8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I91978c34aa86b30969fdb90e57c1edd862a53a51
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-31 01:28:32 +00:00
af3cafb891
Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6 am: 642beae1fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I56d148261c5fe94264ff0a68e87020329d06b857
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-31 01:12:13 +00:00
475d83afd8
Merge "Move utils from network stack to libs." am: 21be4fabb5 am: d065a0a4e6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-31 01:09:46 +00:00
642beae1fd
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
Chalard Jean
authored and
Automerger Merge Worker
commited 2020-07-31 00:53:12 +00:00
d065a0a4e6
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
Chalard Jean
commited 2020-07-29 21:15:48 +09:00
2156153db4
Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7 am: d091e8ff6e am: 405271b652
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I9d621e1342d2e8b7b4e7b0fb72303dad411abce0
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-29 06:28:47 +00:00
5280e52f78
[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
paulhu
commited 2020-07-29 14:14:27 +08:00
bfa9f182b0
Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7 am: d091e8ff6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I35df9a8bb721f1303f351dbb115b09e911ea9a69
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-29 06:13:35 +00:00
405271b652
Merge "[RFPM03] Check permission by uid." am: 629f681106 am: 31dd6c3fd7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I80406643e4797b1e269b4f7c5711339371fa533b
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-29 05:53:25 +00:00
d091e8ff6e
Merge "[RFPM03] Check permission by uid." am: 629f681106
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320375
Change-Id: I520b5d271d6d5214653ebaaeb5d6713c191b911d
Paul Hu
authored and
Automerger Merge Worker
commited 2020-07-29 05:47:15 +00:00
31dd6c3fd7
Merge "[RFPM03] Check permission by uid."
Paul Hu
authored and
Gerrit Code Review
commited 2020-07-29 05:41:32 +00:00
629f681106
Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-release
...
Change-Id: I3669363c1b98ac139f341e0bd898cbbff15cb061
android-build-team Robot
commited 2020-07-29 04:05:49 +00:00
bc67ce544d
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
(cherry picked from commit a40ff70cad00a6c298e07c2c38e95d58074a7157)
Lorenzo Colitti
authored and
android-build-team Robot
commited 2020-07-29 04:04:42 +00:00
b879fbd4f1
Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd am: 42a12b57f2 am: 811fee2a2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I86e762f63a2e18833dcebdae4921a24a18bbf01d
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-29 02:41:38 +00:00
2f5d9400f5
Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd am: 42a12b57f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I9cde0d9e70b389b91bde9b3384f82887259c9c74
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-29 02:14:58 +00:00
811fee2a2a
Merge "Gracefully handle integer overflows." am: 71fdf4ab8d am: 10c70fd2dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-29 01:55:23 +00:00
42a12b57f2
Merge "Gracefully handle integer overflows." am: 71fdf4ab8d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I779298886cfaef330b433fea6009860682df35bd
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-07-29 01:37:48 +00:00
10c70fd2dd
Merge "Gracefully handle integer overflows."
Junyu Lai
authored and
Gerrit Code Review
commited 2020-07-29 01:19:07 +00:00
71fdf4ab8d
Set the NetworkInfo subtype to 0. am: d287e8535d am: f8f651ca6a am: d0b692037e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: Ie947a6cf22a2831d01af703007698a9a08a747bd
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-07-28 18:47:16 +00:00
d750811b83
Set the NetworkInfo subtype to 0. am: d287e8535d am: 85512cbf64 am: 020047560d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: Ieaa50d69279868c4a7bf068e24094881ae7baf1e
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-07-28 18:46:51 +00:00
7c3be74f5b
Set the NetworkInfo subtype to 0. am: d287e8535d am: f8f651ca6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: I6b8d22c0bf3a19f8c661e67454f80ae55f466842
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-07-28 18:28:43 +00:00
d0b692037e
Set the NetworkInfo subtype to 0. am: d287e8535d am: 85512cbf64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: I8a54c8fa4c51d74f6e8b1dc98dad71208f4e3836
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-07-28 18:27:25 +00:00
020047560d
Set the NetworkInfo subtype to 0. am: d287e8535d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: Ida8cd0788ae34f4861fbcb958163b5074258c6ac
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-07-28 18:05:15 +00:00
f8f651ca6a
Set the NetworkInfo subtype to 0. am: d287e8535d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12246826
Change-Id: If570350574c5113763bb86943a27b9330db6b9ad
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-07-28 18:05:12 +00:00
85512cbf64
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585 am: 0b63167552
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I725e6a7b199837b673531fcc458f97a1e325ef56
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-07-28 11:46:59 +00:00
1411f69053
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I2efddd398c4d7cf4d65f1c76c399a3a07a843889
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-07-28 11:31:06 +00:00
0b63167552
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-07-28 11:19:47 +00:00
f61e400585
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: Ifcb4682d75b8df577281030c58b61eff53e6ae20
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-07-28 11:04:20 +00:00
261dd20290
Merge "Update language to comply with Android's inclusive language guidance"
Chiachang Wang
authored and
Gerrit Code Review
commited 2020-07-28 10:51:53 +00:00
7c1142d4ad
[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
paulhu
commited 2020-07-28 18:23:38 +08:00
f1e343c1c3
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
Lorenzo Colitti
commited 2020-07-28 09:20:19 +00:00
d287e8535d
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
Chiachang Wang
commited 2020-07-28 15:36:30 +08:00
7d5f378d5b
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
Pavan Kumar M
commited 2020-07-28 11:36:49 +05:30
0653b60fa6