Xiao Ma
7eafd58b80
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad am: 400b2769fa
...
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
3a3bba00a6
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5 am: 3d1867013e
...
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
400b2769fa
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9 am: 0df54895ad
...
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
3d1867013e
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc am: 18da2dcce5
...
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
0df54895ad
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes." am: 1f6c6479b9
...
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
18da2dcce5
Merge "[RFPM01] Merge package added/removed methods" am: fac73070cc
...
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
1f6c6479b9
Merge "Test IPv6ProvisioningLossParcelable in the NetworkAttributes."
2020-06-29 11:58:24 +00:00
Xiao Ma
c2e0dc084a
Test IPv6ProvisioningLossParcelable in the NetworkAttributes.
...
Bug: 157534516
Test: atest FrameworksNetTests
Change-Id: I8dbff2377457bb8fd0f447be0a3cda9af952f2a2
2020-06-29 11:57:32 +00:00
Paul Hu
fac73070cc
Merge "[RFPM01] Merge package added/removed methods"
2020-06-29 11:50:57 +00:00
Automerger Merge Worker
baef81ce70
Merge "[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 5fafdd4695 -s ours" into rvc-d1-dev-plus-aosp
2020-06-26 15:34:00 +00:00
Lorenzo Colitti
19f918e4b9
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 -s ours am: 5fafdd4695 -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc 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
73c81fd812
[automerger skipped] Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev am: 874dec6ba8 am: 91f12bec0f -s ours
...
am skip reason: Change-Id Ic7bc7138c54c47bbfdf56af5811709fde66f8606 with SHA-1 b0174784bc 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
91f12bec0f
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
5fafdd4695
[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 b0174784bc 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
6b1c4f3cbd
Merge "Send ConnDiags event before revalidating network in CS." am: a4e39ee58a am: ad069383bd am: 2323163720
...
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
aace2f48a9
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
2323163720
Merge "Send ConnDiags event before revalidating network in CS." am: a4e39ee58a am: ad069383bd
...
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
ad069383bd
Merge "Send ConnDiags event before revalidating network in CS." am: a4e39ee58a
...
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
a4e39ee58a
Merge "Send ConnDiags event before revalidating network in CS."
2020-06-26 07:13:56 +00:00
Cody Kesting
b0174784bc
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
6e5c919389
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 8af442d45e am: 1aa51f8eb4 -s ours am: 9fd32beb75 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 177a89beb0 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
9fd32beb75
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 8af442d45e am: 1aa51f8eb4 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 177a89beb0 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
1aa51f8eb4
Merge changes from topic "lnh-platform-split" am: 8af442d45e
...
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
8af442d45e
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
1ed3ab8508
Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp am: 806989d0ed
...
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
806989d0ed
Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp
2020-06-24 21:02:39 +00:00
Luke Huang
6a138f3a1c
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 4ce5c9c101 am: 43e6ff5364 -s ours am: baddf27799 -s ours
...
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 4b667b529a 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
09c5ba98e2
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 027d039d21 -s ours am: 490abc0955 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8baac073d8 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
baddf27799
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 4ce5c9c101 am: 43e6ff5364 -s ours
...
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 4b667b529a 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
490abc0955
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 027d039d21 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8baac073d8 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
43e6ff5364
Merge "Disable sockets and DNS if process lacks INTERNET permission." am: 4ce5c9c101
...
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
027d039d21
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
4ce5c9c101
Merge "Disable sockets and DNS if process lacks INTERNET permission."
2020-06-24 18:42:08 +00:00
Orion Hodson
208eeeddef
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 e7e3e3ea8f )
2020-06-24 14:13:49 +01:00
Orion Hodson
177a89beb0
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 e7e3e3ea8f )
2020-06-24 12:46:47 +00:00
Luke Huang
836c695840
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
cf0dc48358
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
e952ccfdf4
[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
e127bd9c7d
[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: 8ae6128b05 am: 0b55f2fac7 -s ours am: 26d5ea1687 -s ours
...
am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 70aed281f1 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
Paul Hu
26d5ea1687
[automerger skipped] Merge "Make PendingIntent immutable and correct Settings package name" am: 8ae6128b05 am: 0b55f2fac7 -s ours
...
am skip reason: Change-Id I02e3277358623400aa03dc8996af3d7c46a8ce76 with SHA-1 70aed281f1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325698
Change-Id: Ib4f8628ead3b0a39a0d1009cb2fd4c0ef5ea246a
2020-06-23 04:26:59 +00:00
Paul Hu
0b55f2fac7
Merge "Make PendingIntent immutable and correct Settings package name" am: 8ae6128b05
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325698
Change-Id: I39f50eb0b88d0f255bea1bd46cf61da010491f20
2020-06-23 04:09:20 +00:00
Paul Hu
8ae6128b05
Merge "Make PendingIntent immutable and correct Settings package name"
2020-06-23 03:55:22 +00:00
paulhu
68426196a5
Make PendingIntent immutable and correct Settings package name
...
ConnectivityService puts up some notifications with pending
intents, but these pending intents are mutable that content can
be changed by someone. So make these pending intents to be
immutable.
Some OEMs have their own Settings package. Thus, need to get the
current using Settings package name instead of just use default
name "com.android.settings".
Bug: 154928507
Test: atest FrameworksNetTests
Change-Id: I02e3277358623400aa03dc8996af3d7c46a8ce76
Merged-In: I02e3277358623400aa03dc8996af3d7c46a8ce76
2020-06-23 10:05:01 +08:00
Treehugger Robot
b09cb5f69f
[automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: 9f725d606a am: 4454ba73ff -s ours am: 1333cd91aa -s ours
...
am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 bfce3bc8e3 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375
Change-Id: Idcf69400cac750cd32c7f237219f30c3e7d528d7
2020-06-22 17:04:59 +00:00
Treehugger Robot
1333cd91aa
[automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: 9f725d606a am: 4454ba73ff -s ours
...
am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 bfce3bc8e3 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375
Change-Id: I89da68283cb71ce1ee25734d481fa24f966f2042
2020-06-22 16:47:23 +00:00
Treehugger Robot
4454ba73ff
Merge "Update DnsManagerTest for AIDL interface change" am: 9f725d606a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375
Change-Id: Ic9836cb0ca7ad9e97b7edb135dbb1f8269f4a0df
2020-06-22 15:50:00 +00:00
Treehugger Robot
9f725d606a
Merge "Update DnsManagerTest for AIDL interface change"
2020-06-22 15:31:54 +00:00
TreeHugger Robot
39e249d506
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6 am: 39f6071057
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238
Change-Id: I51cac9db3810fe5d799cd83449268ae0fee07ca2
2020-06-22 15:30:31 +00:00
TreeHugger Robot
e6da8ac742
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6 am: 4a5922b7e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238
Change-Id: Ic78fb4953e71ea754cba33348cdae0a0d62e75d8
2020-06-22 15:19:36 +00:00
TreeHugger Robot
39f6071057
Merge "Update DnsManagerTest for AIDL interface change" into rvc-dev am: f6aeae7ca6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11954238
Change-Id: I42c1a772b91c72c420a73e83d41f6f7769a1f972
2020-06-22 15:18:54 +00:00