Remi NGUYEN VAN
080150ee39
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: 53fbc9d8c0 -s ours am: 642e1237dd -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 c3884937e1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iad6a186fda02f69741ef0a2403e16973300bae1e
2020-07-02 09:52:45 +00:00
Remi NGUYEN VAN
642e1237dd
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: 53fbc9d8c0 -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 c3884937e1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8
2020-07-02 09:39:11 +00:00
Remi NGUYEN VAN
53fbc9d8c0
Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I51d32e4efd0d9fc458b02022b6308920f7c812a9
2020-07-02 09:21:23 +00:00
Remi NGUYEN VAN
c98e38195d
Move Inet[4]AddressUtils to libs/net
...
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.
Also refine comments in DhcpResults following feedback in previous
change.
(cherry-pick from internal branch skipping wifi classes; no other
conflict)
Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-07-02 10:52:31 +09:00
Chalard Jean
1efb4bc616
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a am: 007c9dd007 am: aa02f30a39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I5e7c7d0d6dd93d6b2203a9a8caa7acc38fae75e0
2020-07-01 05:47:13 +00:00
Chalard Jean
aa02f30a39
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a am: 007c9dd007
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: Ibc8d633a6e04f7cd0f4c1a0d02ae586232cc0c6a
2020-07-01 05:33:41 +00:00
Chalard Jean
007c9dd007
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."" am: 8ec089e59a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353491
Change-Id: I837da6368ab0492c5c65afba4e6cb388d526199d
2020-07-01 05:21:03 +00:00
Chalard Jean
8ec089e59a
Merge "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib...""
2020-07-01 05:12:40 +00:00
Chalard Jean
f90e5bcc2a
Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..."
...
Revert "Add new network quirk parcelable in the NetworkAttributes."
Revert submission 1323251-ipv6_prov_loss_quirk_parcelable
Reason for revert: Breaks CtsStrictJavaPackagesTestCases
Reverted Changes:
I18e05c09f:Add new network quirk parcelable in the NetworkAtt...
I8dbff2377:Test IPv6ProvisioningLossParcelable in the Network...
Change-Id: Ie906919b344131cd768fbed787248d3caac2f74d
2020-07-01 01:46:26 +00:00
Xiao Ma
1b6aeb7647
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560 am: 22c1b251b6 am: ec4d808567
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: Id024f3d8fff3df18900a9dd2bae0d655901722d0
2020-06-29 12:31:30 +00:00
Paul Hu
d63f062d3f
Merge "[RFPM01] Merge package added/removed methods" am: 6287112701 am: b67261dcc9 am: de2cdb300b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: Ic19f6bd30a1e70b5887719d730ce08bc0539ec10
2020-06-29 12:30:59 +00:00
Xiao Ma
ec4d808567
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560 am: 22c1b251b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: Iaf964024c44e6b78ccb3b8fcf3fc131479747a81
2020-06-29 12:17:26 +00:00
Paul Hu
de2cdb300b
Merge "[RFPM01] Merge package added/removed methods" am: 6287112701 am: b67261dcc9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: Ida8f82d2ec5be1040a2bdf2aa65a94d53f68ea6c
2020-06-29 12:16:47 +00:00
Xiao Ma
22c1b251b6
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 111123c560
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322637
Change-Id: I2f6870d0a6b4e52e484f926d86352f6dcd393cca
2020-06-29 12:04:24 +00:00
Paul Hu
b67261dcc9
Merge "[RFPM01] Merge package added/removed methods" am: 6287112701
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317236
Change-Id: I0c7f6ab65220eaf0169fb4d88f9aec023ab33228
2020-06-29 12:03:56 +00:00
Xiao Ma
111123c560
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes."
2020-06-29 11:58:24 +00:00
Xiao Ma
0c140bf1ec
Test IPv6ProvisioningLossParcelable in the NetworkAttributes.
...
Bug: 157534516
Test: atest FrameworksNetTests
Change-Id: I8dbff2377457bb8fd0f447be0a3cda9af952f2a2
2020-06-29 11:57:32 +00:00
Paul Hu
6287112701
Merge "[RFPM01] Merge package added/removed methods"
2020-06-29 11:50:57 +00:00
android-build-team Robot
0ff2373c7c
Make change and version bump to r_aml_300802900 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Iff018565791817468a1103fbaee0ba638b89fb65
2020-06-27 03:31:45 +00:00
android-build-team Robot
4b22c71402
Snap for 6634012 from b56a22487f9b492a70e5c8d79962cedb6f145568 to rvc-release
...
Change-Id: Ia8c9a3cfa1bd1024e0ef544db743edaa97ae30b8
2020-06-27 01:08:13 +00:00
Automerger Merge Worker
49b8297269
Merge "[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 9e4a87ee75 -s ours" into rvc-d1-dev-plus-aosp
2020-06-26 15:34:00 +00:00
Lorenzo Colitti
d23824c1e8
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 9e4a87ee75 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I0c408a703c9de759cf569b1e8cbeb749fbf906df
2020-06-26 15:33:51 +00:00
Lorenzo Colitti
f40ffce16d
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 76c6bc4a0d -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I55264ab00ba7646dde9e6c7b9a600258b8b992e2
2020-06-26 15:33:41 +00:00
Lorenzo Colitti
76c6bc4a0d
Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I1562abb163e5ddf8a84bbac17d140d4fa1e54adf
2020-06-26 15:21:45 +00:00
Lorenzo Colitti
9e4a87ee75
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 3d1df816d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004847
Change-Id: I5d9f3dfaf49f78773c92f4c6dfefb95adb629ce8
2020-06-26 15:21:24 +00:00
Lorenzo Colitti
d67aa703df
Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586 am: 078956721a am: d92c042e59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662
Change-Id: I8ccbf85a2e49c487424642bba5900239b3faff5f
2020-06-26 08:07:20 +00:00
Lorenzo Colitti
b9128f36a5
Send ConnDiags event before revalidating network in CS.
...
This change updates ConnectivityService to notify the
ConnectivityDiagnosticsHandler of app-reported connectivity before
attempting to revalidate the network. This change forces an ordering on
Connectivity Diagnostics events in the case that the reported
connectivity does not match the known connectivity for the network -
this leads to the network being revalidated and the
ConnectivityDiagnostics event onConnectivityReportAvailable. Passing the
onNetworkConnectivityReported event to the
ConnectivityDiagnosticsHandler first ensures that it is passed to
callbacks before any potential ConnectivityReports are.
Bug: 159718782
Test: android.net.cts.ConnectivityDiagnosticsManagerTest
Original-Change: https://android-review.googlesource.com/1350662
Merged-In: Ic7bc7138c54c47bbfdf56af5811709fde66f8606
Change-Id: Ic7bc7138c54c47bbfdf56af5811709fde66f8606
2020-06-26 07:59:04 +00:00
Lorenzo Colitti
d92c042e59
Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586 am: 078956721a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662
Change-Id: Id42979bdb98469f586d97f05ed8ecdc28fbb878f
2020-06-26 07:48:13 +00:00
Lorenzo Colitti
078956721a
Merge "Send ConnDiags event before revalidating network in CS." am: ed2ccf0586
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350662
Change-Id: Ie3108f4cc45083523f6f0cda67dad1f13568f296
2020-06-26 07:31:08 +00:00
Lorenzo Colitti
ed2ccf0586
Merge "Send ConnDiags event before revalidating network in CS."
2020-06-26 07:13:56 +00:00
Cody Kesting
3d1df816d2
Send ConnDiags event before revalidating network in CS.
...
This change updates ConnectivityService to notify the
ConnectivityDiagnosticsHandler of app-reported connectivity before
attempting to revalidate the network. This change forces an ordering on
Connectivity Diagnostics events in the case that the reported
connectivity does not match the known connectivity for the network -
this leads to the network being revalidated and the
ConnectivityDiagnostics event onConnectivityReportAvailable. Passing the
onNetworkConnectivityReported event to the
ConnectivityDiagnosticsHandler first ensures that it is passed to
callbacks before any potential ConnectivityReports are.
Bug: 159718782
Test: android.net.cts.ConnectivityDiagnosticsManagerTest
Change-Id: Ic7bc7138c54c47bbfdf56af5811709fde66f8606
2020-06-25 16:57:18 -07:00
Orion Hodson
e3eae72916
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e am: ed859035cc -s ours am: 3993085c54 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 c206662f5b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I4b94400277e38db25c76e02f66e4f5f523358452
2020-06-25 08:32:19 +00:00
Orion Hodson
3993085c54
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e am: ed859035cc -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 c206662f5b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
2020-06-25 08:13:32 +00:00
Orion Hodson
ed859035cc
Merge changes from topic "lnh-platform-split" am: 9ee9dcf07e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
9ee9dcf07e
Merge changes from topic "lnh-platform-split"
...
* changes:
Update to use nativehelper/JNIPlatformHelp.h
Sync with libnativehelper refactoring
2020-06-25 07:36:05 +00:00
Orion Hodson
f2bf9760df
Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp am: 05ad56744a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985978
Change-Id: Ia6b5137921c169b28b7383b323c78ff795a849b8
2020-06-24 21:23:41 +00:00
Orion Hodson
05ad56744a
Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp
2020-06-24 21:02:39 +00:00
Luke Huang
c31e684a50
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 9f5ade331a am: f1d39bbada -s ours am: e707bbc8f2 -s ours
...
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 5a42a4132f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: I8198e70f86c734a9ec697f20c4e52af115914a28
2020-06-24 19:26:32 +00:00
Luke Huang
aa7245253c
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 353e8ef81c -s ours am: d49b94564e -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 51221efa45 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I5af3e4f7a38fa4374a568dc99925b76fc0f033a6
2020-06-24 19:12:16 +00:00
Luke Huang
e707bbc8f2
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 9f5ade331a am: f1d39bbada -s ours
...
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 5a42a4132f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: Ib9649cba9bd46a0dc9de42dc89775cc19fff8e57
2020-06-24 19:11:48 +00:00
Luke Huang
d49b94564e
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 353e8ef81c -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 51221efa45 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa
2020-06-24 19:11:24 +00:00
Luke Huang
f1d39bbada
Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 9f5ade331a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: I12eb986a95894e41679673830adbbb727d8a8834
2020-06-24 18:52:53 +00:00
Luke Huang
353e8ef81c
Merge "Move DnsPacket to libs net" am: d295f3e4f4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I9a5f1d701e5c8f7629df1dfcd0dab44e28945dfc
2020-06-24 18:51:42 +00:00
Luke Huang
9f5ade331a
Merge "Disable sockets and DNS if process lacks INTERNET permission."
2020-06-24 18:42:08 +00:00
Orion Hodson
1c962a802f
Update to use nativehelper/JNIPlatformHelp.h
...
Reflects refactoring of JNI helper code that depends on private
methods within libnativehelper.
Bug: 151443957
Test: Treehugger
Change-Id: I7af128f42ae89a77a8e3fb113ea533331153c535
Merged-In: I7af128f42ae89a77a8e3fb113ea533331153c535
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 329c612e3d5ae440bf13e1f5fc9a4012263524e9)
2020-06-24 14:13:49 +01:00
Orion Hodson
c206662f5b
Update to use nativehelper/JNIPlatformHelp.h
...
Reflects refactoring of JNI helper code that depends on private
methods within libnativehelper.
Bug: 151443957
Test: Treehugger
Change-Id: I7af128f42ae89a77a8e3fb113ea533331153c535
Merged-In: I7af128f42ae89a77a8e3fb113ea533331153c535
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit 329c612e3d5ae440bf13e1f5fc9a4012263524e9)
2020-06-24 12:46:47 +00:00
Luke Huang
caaee1d0ec
Disable sockets and DNS if process lacks INTERNET permission.
...
This is a Client-only solution.
- Add to NetdClient a per-process std::atomic_boolean
similar to netIdForProcess and netIdForResolv.
- The boolean says whether the process should be
allowed Internet connectivity.
- Add an @hide method to NetUtils.java to set the boolean;
call it from the initialization code of the new
process just after forking from zygote.
- Make netdClientSocket and dnsOpenProxy check the
boolean. If the boolean is false, return EPERM from
socket calls.
Bug: 150028556
Test: atest NetworkUtilsTest
Test: atest CtsAppSecurityHostTestCases:UseProcessTest
(cherry-pick from internal branch, ag/11881939)
Merged-In: If002280fbad493dfc2db3d9d505c0257d49a9056
Change-Id: If002280fbad493dfc2db3d9d505c0257d49a9056
2020-06-24 11:58:57 +00:00
Luke Huang
ff0dc5cf49
Move DnsPacket to libs net
...
This class might be used by some mainline modules.
Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
(clean cherry-pick from internal branch)
Merged-In: I8841d91456952ded5efbf8ea221289aecc7746ad
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad
2020-06-24 11:32:26 +00:00
paulhu
aa4620914e
[RFPM01] Merge package added/removed methods
...
There are two methods to handle package added/removed from
two differnt listeners. It can use one of listener to handle the
changes. Thus, keep PackageManagerInternal#PackageListObserver
but remove the listening from ConnectivityService.
Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ib2db85e4108f9fda731bf6667d0af0610fc79fea
2020-06-23 16:10:03 +08:00
Paul Hu
c6d90c27a8
[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: f1140d1a9c am: 64e73a539e -s ours am: d43b76f446 -s ours
...
am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 f2db66615d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325698
Change-Id: I50d2cd385165c00e3b21db4b489d4c3a776d16db
2020-06-23 04:27:56 +00:00