Lorenzo Colitti
e145deff18
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f am: 35667ce499
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib9169b66fd9f5bccfbbfaa69392ff176e41d4b53
2021-03-15 15:09:22 +00:00
Lorenzo Colitti
35667ce499
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6edda160620b4a3cbcf85f21081a41d959cf3173
2021-03-15 14:24:34 +00:00
Lorenzo Colitti
3e0314d68f
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie0ca67f38da9d4a70911485d2630fe8bae4cbdfa
2021-03-15 13:48:39 +00:00
Lorenzo Colitti
85bea4887f
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS"
2021-03-15 13:09:14 +00:00
Aaron Huang
3519718a56
Merge changes from topic "pacproxy-service" am: 267bebc6a9 am: de062690cc am: 2b89f2ae7f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6d34753e8bf9201e16121b8f3c6c83aa6358986
2021-03-15 12:56:09 +00:00
Sorin Basca
d569b2f54b
Merge changes from topic "jni-errno-exception" am: 685a40571c am: d43926c07a am: 5d1f25b158
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cb0d95a0eaab330b0763927c92495e50b97cd27
2021-03-15 12:55:03 +00:00
Aaron Huang
2b89f2ae7f
Merge changes from topic "pacproxy-service" am: 267bebc6a9 am: de062690cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294
2021-03-15 12:30:17 +00:00
Aaron Huang
de062690cc
Merge changes from topic "pacproxy-service" am: 267bebc6a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29e9e324f25e584d645900f83d31a00a4e151cbb
2021-03-15 12:12:48 +00:00
Sorin Basca
5d1f25b158
Merge changes from topic "jni-errno-exception" am: 685a40571c am: d43926c07a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4106aed41c8e00a27fa8fb6dbc4dba5ac08d6c2
2021-03-15 12:12:35 +00:00
Aaron Huang
267bebc6a9
Merge changes from topic "pacproxy-service"
...
* changes:
Make PacProxyService be a system service
Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
2021-03-15 11:49:45 +00:00
Sorin Basca
d43926c07a
Merge changes from topic "jni-errno-exception" am: 685a40571c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If704b8e72e74f0e1afcfc59d5ad03c3003e2643a
2021-03-15 11:34:48 +00:00
Sorin Basca
685a40571c
Merge changes from topic "jni-errno-exception"
...
* changes:
Using jniThrowErrnoException in android_util_Process
Using jniThrowErrnoException in android_os_SharedMemory
Using jniThrowErrnoException in android_net_NetworkUtils
2021-03-15 11:16:14 +00:00
Frank Li
8899a3e8f5
[automerger skipped] Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b am: 44d34df483 am: 7e3ba1577f -s ours
...
am skip reason: Change-Id I3a3deca5d2e0f690db8c0061de2db2217376d268 with SHA-1 cc5af7e9ca is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2de4002e694a8063b60b0f6b043bb8830e7a373
2021-03-15 09:41:10 +00:00
Frank Li
7e3ba1577f
Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b am: 44d34df483
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bd903cd723f0c3d87ac9d2aae14a95132e7a2ea
2021-03-15 09:18:29 +00:00
Frank Li
44d34df483
Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I623fd33e756f9ada6b73f716a30778fd6236f6ae
2021-03-15 08:42:02 +00:00
Remi NGUYEN VAN
5b5607e0cd
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5 am: 46adcba662 am: d38a017b28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04b48a4afef8d62d1368f5c7f7d907cb5e12c82e
2021-03-15 08:26:55 +00:00
Paul Hu
ffd7c1f14f
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6 am: 23be8da17e am: 174ffe652c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6f19204d54688ea6af69d503c6dae441ff7afce
2021-03-15 08:26:28 +00:00
Remi NGUYEN VAN
d92103dfc0
Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a am: b8c6c46986 am: 3ddc646220
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia618516b1cd0096b9550dea38703bde3692915cf
2021-03-15 08:25:36 +00:00
Frank Li
b9db86ff3b
Merge "[CS15]Do not use hidden API of PlatformProperties"
2021-03-15 08:01:26 +00:00
Remi NGUYEN VAN
d38a017b28
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5 am: 46adcba662
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I396e8936cf8adc0c46555a3ef5d7771d3a268594
2021-03-15 08:01:03 +00:00
Paul Hu
174ffe652c
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6 am: 23be8da17e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f14d0196b3c641108b1e82def2998d2744cb855
2021-03-15 07:44:28 +00:00
Remi NGUYEN VAN
46adcba662
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7dbcb1e49162210b44bd0cf2204b853c34bb5871
2021-03-15 07:44:21 +00:00
Remi NGUYEN VAN
3ddc646220
Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a am: b8c6c46986
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I462f0d97bf150af7f32238e15e88d34e4c17eed7
2021-03-15 07:44:12 +00:00
Remi NGUYEN VAN
c407499db5
Merge "Revert "Remove connectivity dependency on Preconditions""
2021-03-15 07:30:20 +00:00
Remi NGUYEN VAN
00c531f4e0
Revert "Remove connectivity dependency on Preconditions"
...
This reverts commit 1c17c88002 .
Reason for revert: Build broken: b/182721112
Change-Id: Ibc84ec6d7900fdcf0bc14cd7036f9c08287711db
2021-03-15 07:27:44 +00:00
Paul Hu
23be8da17e
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f1112eef6086798a6f089dde2f297828c0b4f2e
2021-03-15 07:06:12 +00:00
Paul Hu
67503fefc6
Merge "Replace InetAddress#parseNumericAddress"
2021-03-15 07:03:46 +00:00
Remi NGUYEN VAN
b8c6c46986
Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c0c2572ff84a2b163fb2e4e0f3e2cfec043313d
2021-03-15 07:03:36 +00:00
Aaron Huang
b2ad4a95ba
Make PacProxyService be a system service
...
PacProxyInstaller class is running a thread all the time and is
listening to intent ACTION_PAC_REFRESH so it would be better to
make it be a system service with a manager class PacProxyManager
which is obtained with getSystemService(PacProxyManager.class).
Besides, rename PacProxyInstaller to PacProxyService will
be easier to know it's the service for PacProxyManager.
ConnectivityService is going to be a mainline module and it
needs constructor of PacProxyService to be SystemApi.
However, in current design, it needs to pass a handler and
an int arguments to the constructor which would be difficult
to maintain if just expose the constructor directly.
So, define a listener for the event that the current PAC
proxy has been installed so that the handler and the int
arguments can be removed from the constructor.
Bug: 177035719
Test: FrameworksNetTests
Change-Id: I2abff75ec59a17628ef006aad348c53fadbed076
2021-03-15 14:40:58 +08:00
Remi NGUYEN VAN
83c34e272a
Merge "Remove connectivity dependency on Preconditions"
2021-03-15 06:36:15 +00:00
lifr
51b9799737
[CS15]Do not use hidden API of PlatformProperties
...
ConnectivityService is going to become a mainline module, and
it will not able to use hidden method anymore. Using PlatformProperties
as a static library instead of hidden API.
Bug: 170917042
Test: atest FrameworksNetTests
Merged-In: I3a3deca5d2e0f690db8c0061de2db2217376d268
Change-Id: I3a3deca5d2e0f690db8c0061de2db2217376d268
2021-03-15 14:14:18 +08:00
Remi NGUYEN VAN
b9db8b9905
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a am: b13973838a am: 231fb3a246
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2c66e0c97bc383237782f6116398b225c26e3ea
2021-03-15 03:30:53 +00:00
Remi NGUYEN VAN
e30d05f314
[automerger skipped] Merge "Create a service-connectivity-pre-jarjar library" am: 1e976dd3af am: 64f37fc02d am: 5c11659c62 -s ours
...
am skip reason: Change-Id I1acd95ff9bec99b918646e8ec3a57f3ef156e2ca with SHA-1 ab6440acc4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8606cfd56baed07c87dc7ae4ba0eb7292d57a72d
2021-03-15 03:30:35 +00:00
lucaslin
b0228dae26
Call clearCallingIdentity when calling registerNetworkProvider in TNS
...
The caller to create a TestNetworkService via
ConnectivityManager#startOrGetTestNetworkManager should have
passed the MANAGE_TEST_NETWORKS permission check and the caller
doesn't need to declare the permission to pass the permission
check of registerNetworkProvider. So call clearCallingIdentity
when calling registerNetworkProvider in TestNetworkService.
Bug: 181573283
Test: atest CtsNetTestCases:ConnectivityManagerTest#testRequestBackgroundNetwork
Change-Id: Ia28627dacf933d1937978ed9709b975c9a4660ce
2021-03-15 03:29:29 +00:00
Remi NGUYEN VAN
231fb3a246
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a am: b13973838a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f83eb73ce787fd8d8c577deeaced9e6a8d1a117
2021-03-15 02:49:11 +00:00
Remi NGUYEN VAN
5c11659c62
Merge "Create a service-connectivity-pre-jarjar library" am: 1e976dd3af am: 64f37fc02d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic63433f13a6ae28880cfaeb6cfd8b61b059562e0
2021-03-15 02:48:59 +00:00
Remi NGUYEN VAN
b13973838a
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41431bfba97a6fe0678b9a5dc72b19479d5d4c66
2021-03-15 02:07:39 +00:00
Remi NGUYEN VAN
64f37fc02d
Merge "Create a service-connectivity-pre-jarjar library" am: 1e976dd3af
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I17ca508f3da731404306d6e65e9743120a7e0860
2021-03-15 02:05:41 +00:00
Remi NGUYEN VAN
e7ea40527a
Merge "Remove VpnType usage in VpnTransportInfo"
2021-03-15 01:52:30 +00:00
Remi NGUYEN VAN
1e976dd3af
Merge "Create a service-connectivity-pre-jarjar library"
2021-03-15 01:32:47 +00:00
Lucas Lin
2b2b0bf888
Merge "Have a new API to get private DNS mode" into sc-dev
2021-03-15 01:00:25 +00:00
paulhu
cbe7381c31
Replace InetAddress#parseNumericAddress
...
-Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API InetAddress#parseNumericAddress to
InetAddresses#parseNumericAddress.
- Add deprecated method legacyParseIpAndMask() for IpPrefix and
LinkAddress. Because InetAddresses#parseNumericAddress has
a little different behavior in some case, but these two classes
should keep working as before. So these two classes will use
the new deprecated method.
Bug: 181756157
Test: FrameworksNetTests
Change-Id: I1c96b75f0b8d5e93304a39b4a8c8849964e5e810
2021-03-12 19:57:40 +08:00
Remi NGUYEN VAN
5c5f406981
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e8db8aed8 am: b392e8ffa6 am: c3a9529c58
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8b76d3c6e18c2c38d86c5c4bd5a75b6a02437a4
2021-03-12 10:45:30 +00:00
Treehugger Robot
f03eb19a41
Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8 am: 2e28bfa25b am: a9a58051fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4868ba91efd24c4544dc6ce044e1b76d50c1a611
2021-03-12 10:45:09 +00:00
Treehugger Robot
c73eb96736
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 31558edb8e am: 3fef231b42 am: 570a192f35
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibfe6a57de8deb33fc4a63acdf0ea264d5e506883
2021-03-12 10:44:34 +00:00
Treehugger Robot
589d936fa8
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 am: 43b1fa710e am: 3327d66cc8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I446cca57e6841c923ea89ce8f8eddfd1b8e60b79
2021-03-12 10:43:59 +00:00
Remi NGUYEN VAN
c3a9529c58
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e8db8aed8 am: b392e8ffa6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If44709876c213ef752b1dc94ea64f5b4690ff42f
2021-03-12 10:00:57 +00:00
Treehugger Robot
a9a58051fd
Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8 am: 2e28bfa25b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I888dc544595c7b5b085ea70e609cacdd6c526591
2021-03-12 10:00:39 +00:00
Treehugger Robot
570a192f35
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 31558edb8e am: 3fef231b42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I24c665e10814ddf46005fa84ea12cbd4e4e22369
2021-03-12 10:00:28 +00:00
Treehugger Robot
3327d66cc8
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4 am: 43b1fa710e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I890d00fa46d9623bc7d391379ac9b77b7f33703d
2021-03-12 10:00:17 +00:00