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
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
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
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
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
Remi NGUYEN VAN
b392e8ffa6
Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e8db8aed8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e2bc5128658973dc873aa3f6eb41593d8d9a308
2021-03-12 09:30:30 +00:00
Treehugger Robot
2e28bfa25b
Merge "Remove hidden @NetworkType in NetworkInfo" am: f829e86db8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
2021-03-12 09:27:20 +00:00
Treehugger Robot
3fef231b42
Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 31558edb8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida08886109393bc8255de1eec64d5f0a45970eba
2021-03-12 09:24:09 +00:00
Treehugger Robot
43b1fa710e
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor" am: 0a30c831a4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625439
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b3e8b098eb80098198b1e1cf6c2ce2fe138bc0a
2021-03-12 09:22:33 +00:00
Junyu Lai
1931a31772
Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500 am: ed8aca675d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3db655c53a855fe418ba5c6fd8230622805966d5
2021-03-12 09:07:00 +00:00
Remi NGUYEN VAN
7e8db8aed8
Merge "Remove usage of hidden InetSocketAddress constructor"
2021-03-12 09:02:15 +00:00
Treehugger Robot
f829e86db8
Merge "Remove hidden @NetworkType in NetworkInfo"
2021-03-12 08:59:35 +00:00
Treehugger Robot
31558edb8e
Merge "Remove hidden INVALID_RESOURCE_ID in unused param"
2021-03-12 08:57:55 +00:00
Treehugger Robot
0a30c831a4
Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor"
2021-03-12 08:57:47 +00:00
Junyu Lai
ed8aca675d
Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae13465b19d5245782cded0d01ff1b39617c8ac8
2021-03-12 08:24:46 +00:00
lucaslin
50205afdd8
Have a new API to get private DNS mode
...
- Expose PRIVATE_DNS_MODE_OFF, PRIVATE_DNS_MODE_OPPORTUNISTIC and
PRIVATE_DNS_MODE_PROVIDER_HOSTNAME for external users.
- Since PRIVATE_DNS_DEFAULT_MODE_FALLBACK might be changed from
release to release, so it cannot be exposed as a system API.
Remove PRIVATE_DNS_DEFAULT_MODE_FALLBACK and have a new API -
getPrivateDnsMode() for users to get the private DNS mode instead.
Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCases
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Change-Id: I02a1e91b4eafb5f5df3eada1c07b99849a050c3c
2021-03-12 16:11:27 +08:00
Junyu Lai
10af6fb500
Merge changes from topics "vcn04", "vcn12" am: d219f4807c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366
2021-03-12 07:50:50 +00:00
Junyu Lai
d219f4807c
Merge changes from topics "vcn04", "vcn12"
...
* changes:
[VCN12] Expose setSubIds/getSubIds APIs
[VCN04] Add Subscription Id set into NetworkCapabilities
2021-03-12 07:12:59 +00:00
Roshan Pius
99cac41819
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: f72f1d9e28 am: 312bcb6871 am: 6519ca6217
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf60935623b62e29cb2ba52b4de554c7f0d78ef1
2021-03-12 07:12:03 +00:00
Paul Hu
e6a477a7d6
Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 2269d7e3fa am: d5eb1fad4d am: cad9f72e91
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc75ae78a6a09fac22cd2ae9ddc04138c4ba02d3
2021-03-12 07:11:35 +00:00
Roshan Pius
6519ca6217
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: f72f1d9e28 am: 312bcb6871
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47515a4c38e96f6e1caa8ceb50e6b83de8c3ec35
2021-03-12 06:30:45 +00:00
Paul Hu
cad9f72e91
Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 2269d7e3fa am: d5eb1fad4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3cc5b5a8d6ae737f75f9c1cf17f7113bed663613
2021-03-12 06:30:34 +00:00
Treehugger Robot
ff5480575e
Merge "Remove Slog usage in NetworkState" am: 437ee783c4 am: 15516e3f0b am: fc8d0f981f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0345579ab38ffd06dc548d7c268f1e2dff2c7b9d
2021-03-12 06:13:59 +00:00
Remi NGUYEN VAN
6ce9aa2d49
Merge "Move ParseException to Connectivity" am: eae251b42a am: 160a29cad8 am: 6a30b70575
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba0c91e109d04be28dca01c1997e74c06f12f60f
2021-03-12 06:13:12 +00:00
Roshan Pius
312bcb6871
Merge "ConnectivityManager: Provide API's to include location sensitive info" am: f72f1d9e28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595396
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf358f0532023ab990dea0ad958eacaa441e107c
2021-03-12 05:58:11 +00:00
Roshan Pius
f72f1d9e28
Merge "ConnectivityManager: Provide API's to include location sensitive info"
2021-03-12 05:56:29 +00:00
Paul Hu
d5eb1fad4d
Merge "Stop using PackageManagerInternal in PermissionMonitor" am: 2269d7e3fa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620879
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I61c84ce1b8e1a9ccdb8fd1581bf0c3906db943f3
2021-03-12 05:51:23 +00:00
Treehugger Robot
fc8d0f981f
Merge "Remove Slog usage in NetworkState" am: 437ee783c4 am: 15516e3f0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14f13eefd5a1649df8eb3b3f77bfda45997b26de
2021-03-12 05:32:55 +00:00
Remi NGUYEN VAN
6a30b70575
Merge "Move ParseException to Connectivity" am: eae251b42a am: 160a29cad8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb5674e812f2a2f2a6a1e23aa46a2d8f208099f5
2021-03-12 05:32:43 +00:00
Paul Hu
2269d7e3fa
Merge "Stop using PackageManagerInternal in PermissionMonitor"
2021-03-12 05:23:05 +00:00
Treehugger Robot
15516e3f0b
Merge "Remove Slog usage in NetworkState" am: 437ee783c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628360
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e01b140db4d44de081ba4d87cca63578271500e
2021-03-12 05:15:42 +00:00
Remi NGUYEN VAN
160a29cad8
Merge "Move ParseException to Connectivity" am: eae251b42a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626205
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06ac628c283c0a59a756fb5d6e94afb5aef949dd
2021-03-12 05:12:33 +00:00
Treehugger Robot
437ee783c4
Merge "Remove Slog usage in NetworkState"
2021-03-12 05:12:26 +00:00
Lucas Lin
3f6f8215c3
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41 am: 3912538c41 am: 9038eeece3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
2021-03-12 04:58:40 +00:00
Frank Li
cb7b1a6643
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31 am: 22f91bdbca am: ac99b3fd18
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6192035f3be707c6f840b373579d2666ca5c3ac6
2021-03-12 04:58:20 +00:00
Lucas Lin
9038eeece3
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41 am: 3912538c41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f41a9cd27dd37c859e69fe02a32b9ab13fb0d46
2021-03-12 04:34:22 +00:00
Frank Li
ac99b3fd18
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31 am: 22f91bdbca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6aa11902b9ade040bee702650722edfd65b9113
2021-03-12 04:34:11 +00:00
Remi NGUYEN VAN
eae251b42a
Merge "Move ParseException to Connectivity"
2021-03-12 04:27:55 +00:00
Lucas Lin
3912538c41
Merge changes Ib80f814f,Ic605e489 am: 3bde652e41
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
2021-03-12 03:56:18 +00:00
Frank Li
22f91bdbca
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService" am: ab31bd8c31
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9096f951a18b1ffe96efa1d48207dac644d4e92c
2021-03-12 03:52:27 +00:00
Lucas Lin
3bde652e41
Merge changes Ib80f814f,Ic605e489
...
* changes:
Use new API - getIpSecNetIdRange() in IpSecService
Add a new API to get the network ID range of IPSec tunnel interface
2021-03-12 03:30:32 +00:00
Frank Li
ab31bd8c31
Merge "[CS17]Remove useless code(AsyncChannel) from ConnectivityService"
2021-03-12 02:45:30 +00:00