Paul Hu
f8f45a92f5
Merge "Revert "[RFPM03] Check permission by uid."" am: fc98e38215
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654
Change-Id: I51b37f8e717123a2725ade859d5b9dcff19ef484
2020-08-20 08:33:41 +00:00
Paul Hu
d22d125329
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: c45d2d3848
...
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
fc98e38215
Merge "Revert "[RFPM03] Check permission by uid.""
2020-08-20 08:24:30 +00:00
Paul Hu
c45d2d3848
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method""
2020-08-20 08:14:48 +00:00
Paul Hu
46ccb1743f
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 am: 6a6253cddd am: 298e83c281 am: c6ac338a20
...
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
c6ac338a20
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 am: 6a6253cddd am: 298e83c281
...
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
298e83c281
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804 am: 6a6253cddd
...
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
6a6253cddd
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 07c54c9804
...
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
07c54c9804
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class""
2020-08-20 06:25:06 +00:00
Paul Hu
9c60af3743
Revert "[RFPM03] Check permission by uid."
...
This reverts commit 8adb39a688 .
Reason for revert: Regression in SW. Bug:162499840
Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7
2020-08-20 06:23:16 +00:00
Paul Hu
b275ee6f41
Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"
...
This reverts commit de5b46c10b .
Reason for revert: Regression in SW. Bug:162499840
Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed
2020-08-20 06:23:00 +00:00
Paul Hu
dfb26833f0
Revert "[RFPM05] Add UidNetdPermissionInfo class"
...
This reverts commit 1daf973605 .
Reason for revert: Regression in SW. Bug:162499840
Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10
2020-08-20 03:10:08 +00:00
junyulai
75125f2131
Notify the keepalive is stopped after the slot has been released
...
Currently, the callbacks of stopping were fired when stop procedure
is started, because the upper layer apps only care about the reason
of stopping instead of stopping result. Thus, there is no need to
wait for the result comes back. However, this behavior generates
races if apps want to re-start keepalive immediately since the
resources are not released yet.
Fix: 134891441
Fix: 140305589
Test: atest com.android.server.ConnectivityServiceTest#testPacketKeepalives \
--rerun-until-failure 1000
Change-Id: I987776a9211a50e964c4675b747bc10e203750f1
2020-08-20 11:00:08 +08:00
junyulai
a57040886b
Skip RAT type listener registration if IMSI is not available
...
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.
Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.
Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
2020-08-19 09:53:20 +00:00
Chalard Jean
150edd2987
Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 am: 05784f0a5a am: 9be3ecf9b3 am: af253ce94a
...
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
af253ce94a
Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 am: 05784f0a5a am: 9be3ecf9b3
...
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
9be3ecf9b3
Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903 am: 05784f0a5a
...
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
05784f0a5a
Merge "Rename Kotlin util files to not include the Kt suffix" am: 9f2f0ce903
...
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
9f2f0ce903
Merge "Rename Kotlin util files to not include the Kt suffix"
2020-08-13 03:52:47 +00:00
Chiachang Wang
0375537cf0
Merge "Update language to comply with Android's inclusive language guidance" am: e559544470 am: bafca91de9 am: f8ceddc7ca am: e0a40cdf0c
...
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
e0a40cdf0c
Merge "Update language to comply with Android's inclusive language guidance" am: e559544470 am: bafca91de9 am: f8ceddc7ca
...
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
f8ceddc7ca
Merge "Update language to comply with Android's inclusive language guidance" am: e559544470 am: bafca91de9
...
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
bafca91de9
Merge "Update language to comply with Android's inclusive language guidance" am: e559544470
...
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
e559544470
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-12 09:30:11 +00:00
Paul Hu
7d4e77f07e
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 829abbcb31 am: e173360f82 am: c9892ecb25 am: 6ddb94f5c8
...
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
6ddb94f5c8
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 829abbcb31 am: e173360f82 am: c9892ecb25
...
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
c9892ecb25
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 829abbcb31 am: e173360f82
...
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
e173360f82
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 829abbcb31
...
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
829abbcb31
Merge "[RFPM05] Add UidNetdPermissionInfo class"
2020-08-12 06:17:46 +00:00
Chiachang Wang
263ce447ca
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
1daf973605
[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
39175f2670
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
d85b91d2ac
[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours am: 4f1ea123e0 -s ours
...
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 461a122ae6 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
4f1ea123e0
[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 461a122ae6 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
f5c38386a6
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 db8ae41da255caad7640fc2c1b58d16aafb0e62b)
2020-08-11 04:46:09 +00:00
Chalard Jean
34a4918757
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 0714d122ac am: 934e9a5d9f -s ours am: 535804696d -s ours am: 480e662684 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 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
d289fa5c7d
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 059356d83f am: 6f82a0f220 -s ours am: f5dedc3745 -s ours am: 80a8b293d2 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 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
480e662684
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 0714d122ac am: 934e9a5d9f -s ours am: 535804696d -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 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
80a8b293d2
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 059356d83f am: 6f82a0f220 -s ours am: f5dedc3745 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 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
535804696d
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 0714d122ac am: 934e9a5d9f -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 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
f5dedc3745
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 059356d83f am: 6f82a0f220 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 7007e35032 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
934e9a5d9f
Merge changes I33b70b0a,I1074eedb am: 0714d122ac
...
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
6f82a0f220
Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 059356d83f
...
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
bb9f8738a2
Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 75d9e28a07 am: 926a2a40cf -s ours" into rvc-qpr-dev-plus-aosp
2020-08-07 06:54:59 +00:00
Automerger Merge Worker
7733abae6b
Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 75d9e28a07 -s ours am: dbb502397d -s ours" into rvc-qpr-dev-plus-aosp
2020-08-07 06:54:54 +00:00
Chalard Jean
5e4a05e4c1
[automerger skipped] Resolve the endpoint in legacy VPN am: 75d9e28a07 am: 926a2a40cf -s ours
...
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 678245fef4 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
df7118cdf6
Merge "[automerger skipped] Add a test for starting the legacy VPN. am: 3103a6ee03 am: 6995503731 -s ours" into rvc-qpr-dev-plus-aosp
2020-08-07 06:54:48 +00:00
Chalard Jean
a20054ad32
[automerger skipped] Resolve the endpoint in legacy VPN am: 75d9e28a07 -s ours am: dbb502397d -s ours
...
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 678245fef4 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
2bacb6817d
[automerger skipped] Add a test for starting the legacy VPN. am: 3103a6ee03 am: 6995503731 -s ours
...
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 7b76f806dd 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
f2482451c0
[automerger skipped] Add a test for starting the legacy VPN. am: 3103a6ee03 -s ours am: cd5e78689a -s ours
...
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 7b76f806dd 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