Paul Hu
8fa30d7651
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8 am: a370cac809
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653
Change-Id: I123a821f1b121f4ea11dc2a1cb71bf88de409797
2020-08-20 09:19:14 +00:00
Paul Hu
a370cac809
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653
Change-Id: I159f2052d27ad2c923c4463f161fbb3358eb1bb2
2020-08-20 09:05:53 +00:00
Paul Hu
9ea57d25d8
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653
Change-Id: Ifa19cb8fce8dca66ac5f4ecc7737c1c095b7b35b
2020-08-20 08:51:45 +00:00
Paul Hu
9f33dbb509
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653
Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c
2020-08-20 08:27:16 +00:00
Paul Hu
bddd412feb
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method""
2020-08-20 08:14:48 +00:00
Paul Hu
5a93858eb3
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1 am: a484db66e9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652
Change-Id: I146f4ec57303570d7dc37716882075701d7f32d1
2020-08-20 07:58:15 +00:00
Paul Hu
a484db66e9
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652
Change-Id: I148fd645e30d866073a883550628f4013569af3c
2020-08-20 07:45:15 +00:00
Paul Hu
99653eada1
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652
Change-Id: I9edf5bfaa9cbc037e87f5781ba07a2c87932f3aa
2020-08-20 07:04:43 +00:00
Paul Hu
701cd3908e
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652
Change-Id: I8cef4a21aa8fd1923334c2a99e4ff2e864f516a5
2020-08-20 06:44:04 +00:00
Paul Hu
324af52c7a
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class""
2020-08-20 06:25:06 +00:00
Paul Hu
e573ac006d
Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"
...
This reverts commit bfa9f182b0 .
Reason for revert: Regression in SW. Bug:162499840
Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed
2020-08-20 06:23:00 +00:00
Paul Hu
9e986a8e98
Revert "[RFPM05] Add UidNetdPermissionInfo class"
...
This reverts commit fbc1f34c22 .
Reason for revert: Regression in SW. Bug:162499840
Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10
2020-08-20 03:10:08 +00:00
Chalard Jean
a9b3729c3a
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647 am: bda6506a01
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I69da39a99014256dd1188cb522e8d0900deb66d1
2020-08-13 04:57:30 +00:00
Chalard Jean
bda6506a01
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad
2020-08-13 04:43:45 +00:00
Chalard Jean
97c4e1a647
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
2020-08-13 04:26:11 +00:00
Chalard Jean
97cda73a1c
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084
Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
2020-08-13 04:09:27 +00:00
Chalard Jean
6a8da60a32
Merge "Rename Kotlin util files to not include the Kt suffix"
2020-08-13 03:52:47 +00:00
Chiachang Wang
89e9d75d7d
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009 am: 3db81f877e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7
2020-08-12 10:43:42 +00:00
Chiachang Wang
3db81f877e
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626
2020-08-12 10:28:50 +00:00
Chiachang Wang
148be57009
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d
2020-08-12 10:10:11 +00:00
Chiachang Wang
6afddeb044
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b
2020-08-12 09:52:30 +00:00
Chiachang Wang
64f9851e3a
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-12 09:30:11 +00:00
Paul Hu
b3ab880007
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 am: 1cc0664651 am: e09d3ece31 am: f00246ed26
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556
Change-Id: I390c22d8b114d94990a5e81ad02d47beea115680
2020-08-12 07:25:48 +00:00
Paul Hu
f00246ed26
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 am: 1cc0664651 am: e09d3ece31
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556
Change-Id: I6992464abf1f79bde4da0b0ac6e9d13619ef485d
2020-08-12 07:11:46 +00:00
Paul Hu
e09d3ece31
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 am: 1cc0664651
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556
Change-Id: I0878281e2033f093f3b9cbf608c30c44bdd99278
2020-08-12 06:53:13 +00:00
Paul Hu
1cc0664651
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556
Change-Id: I91a603d8b37ee750c3f582363bec94977d70014e
2020-08-12 06:37:34 +00:00
Paul Hu
255bf95e97
Merge "[RFPM05] Add UidNetdPermissionInfo class"
2020-08-12 06:17:46 +00:00
Chiachang Wang
e6a0a2b6b9
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 ; atest FrameworkNetTests
Change-Id: Ib6b4c9526992c31e05e82be80e2b9b86bc0b57ef
2020-08-12 12:23:59 +08:00
paulhu
fbc1f34c22
[RFPM05] Add UidNetdPermissionInfo class
...
Add UidNetdPermissionInfo class to store netd permission info of
each uid. Use the bit mask for combining all netd permission into
one value which can update and get the uid permission easily.
Moreover, aosp/1340042 add carryover package info into this class
which centralizes all netd permissions relevant data.
Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I3b81ea2a5017e8f4d0d603144a33c9b08640d7ba
2020-08-12 10:33:18 +08:00
Chalard Jean
e47850dbf2
Rename Kotlin util files to not include the Kt suffix
...
Callers don't care what language the utilities are written in
Test: builds
Change-Id: Ie212144f36c50db223c05f3fcb6bad745842cb5e
2020-08-12 10:02:50 +09:00
Junyu Lai
471d8b5541
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours am: d1d7440a3c -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 bd97cc8ebf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ib986336e2d7ef9c34474cc8c21d181f680b4823e
2020-08-11 05:28:38 +00:00
Junyu Lai
d1d7440a3c
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 bd97cc8ebf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ie4999416cdf9e3a05f3193e3402eae3129481703
2020-08-11 05:14:45 +00:00
Lorenzo Colitti
fe986af008
Fix fd leak in KeepaliveTracker.
...
The semantics of FileDescriptor in AIDL are that the callee must close
the file descriptor it receives manually.
Fix: 157789860
Bug: 155136951
Test: treehugger
Change-Id: Ice9fc9abe2959a84ad138a95c900dff676653665
Merged-In: Ice9fc9abe2959a84ad138a95c900dff676653665
(cherry picked from commit e0427cea8f )
2020-08-11 04:46:09 +00:00
Chalard Jean
09acc26118
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours am: b4d60515ab -s ours am: 8fd8590f92 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I8a133f595e5f40a0aec4b831070997c9a0fa4bdc
2020-08-07 07:37:08 +00:00
Chalard Jean
7602b30209
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 403df8633d am: 40c2c5f85b -s ours am: 32f53e1cbb -s ours am: 4a844bab4c -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I3fa582c372cf3b4c9d4063e343411eaa71ef438b
2020-08-07 07:37:06 +00:00
Chalard Jean
8fd8590f92
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours am: b4d60515ab -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b
2020-08-07 07:26:54 +00:00
Chalard Jean
4a844bab4c
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 403df8633d am: 40c2c5f85b -s ours am: 32f53e1cbb -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I853068e1d6301fc99466f255e9084a130d122971
2020-08-07 07:26:47 +00:00
Chalard Jean
b4d60515ab
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58
2020-08-07 07:16:28 +00:00
Chalard Jean
32f53e1cbb
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 403df8633d am: 40c2c5f85b -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I5b15fde5cb76d1dc178a3cb2b1597e0c27aa7af2
2020-08-07 07:16:23 +00:00
Chalard Jean
a2772cf640
Merge changes I33b70b0a,I1074eedb am: 1fb7241345
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
2020-08-07 06:59:30 +00:00
Chalard Jean
40c2c5f85b
Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 403df8633d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6
2020-08-07 06:59:26 +00:00
Automerger Merge Worker
c7bbff1ba2
Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 594e470daf am: 926a2a40cf -s ours" into rvc-qpr-dev-plus-aosp
2020-08-07 06:54:59 +00:00
Automerger Merge Worker
a0246f28b3
Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 594e470daf -s ours am: 9ec319389e -s ours" into rvc-qpr-dev-plus-aosp
2020-08-07 06:54:54 +00:00
Chalard Jean
3d553663c0
[automerger skipped] Resolve the endpoint in legacy VPN am: 594e470daf am: 926a2a40cf -s ours
...
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 0bfc7ad392 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325669
Change-Id: I9ecb2fdf57554028c60084f6ed86f2e4d08fc387
2020-08-07 06:54:54 +00:00
Automerger Merge Worker
7be6af9649
Merge "[automerger skipped] Add a test for starting the legacy VPN. am: d3a625ce99 am: 6995503731 -s ours" into rvc-qpr-dev-plus-aosp
2020-08-07 06:54:48 +00:00
Chalard Jean
9879c51d84
[automerger skipped] Resolve the endpoint in legacy VPN am: 594e470daf -s ours am: 9ec319389e -s ours
...
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 0bfc7ad392 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325669
Change-Id: Ie5b037df1d53019c773ecebf7db9d38dd9dd8df0
2020-08-07 06:54:29 +00:00
Chalard Jean
30d5931733
[automerger skipped] Add a test for starting the legacy VPN. am: d3a625ce99 am: 6995503731 -s ours
...
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 e2bfd0071b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12330622
Change-Id: Ifee93b0591d129129731d6dcf9c47e0a6ca2f5a9
2020-08-07 06:54:27 +00:00
Chalard Jean
59aaa31760
[automerger skipped] Add a test for starting the legacy VPN. am: d3a625ce99 -s ours am: ba0233b49a -s ours
...
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 e2bfd0071b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12330622
Change-Id: Ic7c62d74001747f8983b9e6585de1ddbda16b06e
2020-08-07 06:54:10 +00:00
Chalard Jean
1fb7241345
Merge changes I33b70b0a,I1074eedb
...
* changes:
Remove the services.net-module-wifi module target.
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
2020-08-07 06:45:15 +00:00
Chalard Jean
9ec319389e
[automerger skipped] Resolve the endpoint in legacy VPN am: 594e470daf -s ours
...
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 0bfc7ad392 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325669
Change-Id: If767dc2c9fd68e0a6610a42319f2a61d7fb60c1f
2020-08-07 06:45:05 +00:00