Commit graph

14,246 commits

Message SHA1
Expose BIP and VSIM relavent definitions
In order to support special APNs below, OEM may need extra
NetworkCapabilities and apn type definition to support the
carriers request. Add corresponding definition into API
surface.

VSIM: for Virtual SIM service
BIP: for Bearer Independent Protocol

Bug: 130869457
Test: make update-api
Change-Id: I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5

Chiachang Wang   commited 2021-03-25 21:19:37 +08:00
38e6236781
Merge "Add network disconnected callback" into sc-dev
Chiachang Wang   authored and   Android (Google) Code Review   commited 2021-03-25 12:24:20 +00:00
52078e7fe7
Merge "Add static for constant" into sc-dev
Lucas Lin   authored and   Android (Google) Code Review   commited 2021-03-25 11:34:09 +00:00
3818accfc1
Add network disconnected callback
Create a network callback to notify network agent after the
native network being destroyed by netd which means the network
is fully disconnected. The NetworkAgent may handle this event
after sending disconnect state to ConnectivityService to proceed
its pending works that have to be done after it.

Bug: 178725261
Test: make update-api
Change-Id: I602ff2c688909473b03b72c9407d4286608cff4c
CTS-Coverage-Bug: 178725261

Chiachang Wang   commited 2021-03-25 09:58:48 +00:00
4ab0a63b36
Merge "[NS04.8] Address comments from NS04 and NS04.5" into sc-dev
Chalard Jean   authored and   Android (Google) Code Review   commited 2021-03-25 09:34:05 +00:00
e43fc14ea7
Merge "Add network created callback support" into sc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-03-25 08:52:56 +00:00
a2e53b9d30
[NS04.8] Address comments from NS04 and NS04.5
Bug: 167544279
Test: ConnectivityServiceTest
Change-Id: Ia930b3d3e723075cb47e267d589c576ee2d4490f

Chalard Jean   commited 2021-03-25 13:35:56 +09:00
d7268cd556
Fix apex_available on service-connectivity
arc-services depends on service-connectivity, so it also needs to be
available to the platform.

Bug: 183668370
Test: m
Change-Id: Id82125e98abf59b1cc8cb3fceab376597f0496ed

Remi NGUYEN VAN   commited 2021-03-25 12:17:51 +09:00
40ca93251e
Merge "Use a longer test timeout in integration test" am: f652408e6c am: 7ffa156a73 am: fcf54cf966
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Ie457ecaa93f96d221f75d4eb59d44bc7857c67fb

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-25 03:11:16 +00:00
d39dd2f6aa
Merge "Use a longer test timeout in integration test" am: f652408e6c am: 7ffa156a73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-25 02:36:19 +00:00
fcf54cf966
Merge "Merge framework-connectivity impl and stub targets" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-25 02:05:06 +00:00
746577e7dd
Merge "Use a longer test timeout in integration test" am: f652408e6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Ia76f196039f7d748f47bd4e9a62eb59c8ad1b116

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-25 01:53:51 +00:00
7ffa156a73
Merge "Use a longer test timeout in integration test"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-25 01:24:51 +00:00
f652408e6c
Add network created callback support
Create a network callback to notify network agent after
netd has created the network, so that the NetworkAgent may
wait for this callback and ensure the pre-work to communicate
with netd completed.

Bug: 178725261
Test: make update-api
Change-Id: I8c2ff7bd6980ae838abc5669f9419d62741b8666
CTS-Coverage-Bug: 178725261

Chiachang Wang   commited 2021-03-25 00:27:11 +00:00
85d72bdad0
Merge "Add 5G/NR QOS support" am: df448f6eaa am: 6ed7c1c523 am: 3bad6f9856
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: I74c0d7d771d0b7e067dddc582389f77b8a899542

Jayachandran Chinnakkannu   authored and   Automerger Merge Worker   commited 2021-03-24 18:58:50 +00:00
24411775d7
[automerger skipped] Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: eb3ba19447 am: c97c779c98 am: 688f015e64 -s ours
am skip reason: skip tag Change-Id I4c544415e12adf442fd2415c371b1b70a39c3aa4 with SHA-1 457dfd5dec is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: If0f92d490fc903ba2037766a69365eb44af8027e

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-24 18:57:34 +00:00
f3362ecfcb
Merge "Add 5G/NR QOS support" am: df448f6eaa am: 6ed7c1c523
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: If32e710cfea988dbaa438ffee547707aa06e6545

Jayachandran Chinnakkannu   authored and   Automerger Merge Worker   commited 2021-03-24 18:54:17 +00:00
3bad6f9856
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: eb3ba19447 am: c97c779c98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: I99fe564e3fd7e6e92416a3d76054e62969cdd48f

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-24 18:53:30 +00:00
688f015e64
Merge "Add 5G/NR QOS support" am: df448f6eaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762

Change-Id: Icd4c21b9731256c9b3d39bffc5fddc43276c5fda

Jayachandran Chinnakkannu   authored and   Automerger Merge Worker   commited 2021-03-24 18:26:19 +00:00
6ed7c1c523
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." am: eb3ba19447
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651532

Change-Id: If272068940e9a06efbb40149e2b4dd5fbb1185d6

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-24 18:13:19 +00:00
c97c779c98
Merge "Add 5G/NR QOS support"
Jayachandran Chinnakkannu   authored and   Gerrit Code Review   commited 2021-03-24 17:44:48 +00:00
df448f6eaa
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager."
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-24 17:22:50 +00:00
eb3ba19447
Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.
These constants will now be including all the reasons for why an
uid's network access can be blocked, instead of only the
restrictions that could be imposed by NPMS.

Bug: 183473548
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4
Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4

Sudheer Shanka   authored and   Lorenzo Colitti   commited 2021-03-25 01:33:26 +09:00
04aab0f60f
Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." into sc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-03-24 16:02:56 +00:00
07c24e301d
Merge framework-connectivity impl and stub targets
Instead of using api_only: true, use a single java_sdk_library to
generate both framework-connectivity stubs and
framework-connectivity.impl.

Bug: 183600168
Test: m
Change-Id: I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165

Remi NGUYEN VAN   commited 2021-03-24 23:52:58 +09:00
972aa34432
Merge "Add min_sdk_version to connectivity targets" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-24 12:48:49 +00:00
5607c01e16
Merge changes from topic "libframework_jni_ndk" into sc-dev
* changes:
  Build connectivity JNI against libc++_static
  Remove dependency on libnetd_client

Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-24 12:46:06 +00:00
75a61a36d6
Add min_sdk_version to connectivity targets
All targets need min_sdk_version 30 to be included in the tethering
APEX. They will actually never be used on SDK 30 and are only loaded on
31, but this is necessary to be included in com.android.tethering.

Bug: 171540887
Test: m
Change-Id: I190fd1f3c9fabff057d0a2bd7f45b63a4fe447b3

Remi NGUYEN VAN   commited 2021-03-24 10:08:39 +00:00
4dbc3b55c9
Build connectivity JNI against libc++_static
Instead of including the whole libc++ library by linking it dynamically,
use the static version so that unused symbols can be stripped.

This allows reducing the APEX size by 1MB (3.7MB -> 2.7MB), as otherwise
libc++ is included twice for 32 and 64 bit variants.

Bug: 171540887
Test: Device boots and has connectivity, size reduced

Change-Id: Ia66d795cf23d6f45997278300c103976433f7c5c

Remi NGUYEN VAN   commited 2021-03-24 10:08:39 +00:00
35b485e106
Remove dependency on libnetd_client
NetworkUtils can just use the NDK to achieve the same.

Also make sure network handles can have the local nameservers flag, for
the JNI API, and create/parse them accordingly in Network.

Bug: 171540887
Test: atest CtsNetTestCases (in particular MultinetworkApiTest,
          DnsResolverTest, NetworkTest)
Change-Id: I2e7b78263f7ca0cab9458854858a7423f6bd2854

Remi NGUYEN VAN   commited 2021-03-24 10:08:39 +00:00
6630463cbe
Add static for constant
Bug: 182963397
Test: atest IpConnectivityMetricsTest
Test: atest NetdEventListenerServiceTest
Change-Id: I3826b9efc3418a724bd3753b9ad573adc3343b72

lucaslin   commited 2021-03-24 16:23:35 +08:00
c9a448808b
[NS04.7] Reinstate a necessary change
NS04.5 removed a security that it shouldn't have. Reinstate it.

Bug: 167544279
Test: ConnectivityServiceTest
Change-Id: If614da813a96d1b50a16fa4be5659e1647d9469d

Chalard Jean   commited 2021-03-24 15:57:26 +09:00
7618f1a492
Merge changes I975a9439,Idec1fe8e into sc-dev
* changes:
  [NS04.5] Have NetworkOffer embark a provider ID
  [NS04] Introduce Network Offers and their callbacks

Chalard Jean   authored and   Android (Google) Code Review   commited 2021-03-24 06:45:50 +00:00
7015275e2e
Merge "API to get network visible network capability name" into sc-dev
Sarah Chin   authored and   Android (Google) Code Review   commited 2021-03-24 05:27:45 +00:00
605ea88c66
Merge "Add annotation for Vpn#getNetwork()" into sc-dev
Lucas Lin   authored and   Android (Google) Code Review   commited 2021-03-24 03:25:23 +00:00
26990d5bc8
Merge "Fix cannot success verify count of the networkAgent Config items on R device" into sc-dev
Frank Li   authored and   Android (Google) Code Review   commited 2021-03-24 02:35:51 +00:00
00fa3f2725
Add 5G/NR QOS support
Bug: 155176305
Bug: 182317794
Test: atest ConnectivityServiceTest
      atest QosCallbackTrackerTest

Change-Id: Idf6d8a7c3b80bc50a2c1244ceaefea9381d40c2f

Jayachandran C   commited 2021-03-23 19:14:21 -07:00
8ae3bf3f92
Merge "Re-implement NetworkUtils#queryUserAccess." into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-24 01:28:35 +00:00
48cd32c356
Merge "Get NetworkCapabilities from NetworkCallback" into sc-dev
Lucas Lin   authored and   Android (Google) Code Review   commited 2021-03-24 01:07:50 +00:00
ffe4be60fb
API to get network visible network capability name
Test: atest DataConnectionTest, DcTrackerTest
Bug: 181916712
CTS-Coverage-Bug: 183553812
Change-Id: Iae63ac4d62641cee2bd0f0c5f50dd729750d514c

Sarah Chin   commited 2021-03-24 00:27:11 +00:00
89888d72e7
Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.
These constants will now be including all the reasons for why an
uid's network access can be blocked, instead of only the
restrictions that could be imposed by NPMS.

Bug: 183473548
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Merging internally first to handle conflicts.
Change-Id: I4c544415e12adf442fd2415c371b1b70a39c3aa4

Sudheer Shanka   commited 2021-03-23 15:26:29 -07:00
457dfd5dec
Merge "Remove Notification.DevFlags" into sc-dev
Jeff DeCew   authored and   Android (Google) Code Review   commited 2021-03-23 19:50:27 +00:00
8bbf0abc6a
[automerger skipped] Merge "Fix cannot find removeUnwantedCapability on R device" am: 3ef6584f1b am: f85195ae06 am: b5d62d1f83 -s ours
am skip reason: skip tag Change-Id Icf2cda325795acee22a6c634e8d978f64c5ac3cb with SHA-1 8428118d0f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302

Change-Id: I74d0e6ea112c4714c09a12f908fb9273c8477584

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-03-23 14:09:59 +00:00
83eaae118e
Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348 am: 06238861b5 am: b948cc3ba0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-23 14:09:30 +00:00
a391ad837f
[automerger skipped] Merge "Add NetworkRequest.Builder creating from an existing instance" am: 08bebe4609 am: eefea38ae5 am: 5898f562ed -s ours
am skip reason: skip tag Change-Id I068462b2a1410daf67b0c95f2b643d396f079531 with SHA-1 c2e79ada6c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649294

Change-Id: Icd22cc8edbfbbfe0dc8baecdc966d11c9a43a2ff

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-23 14:05:23 +00:00
60721636cd
[automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related APIs" am: 20d187254b am: 4a074bc753 am: aec7499fca -s ours
am skip reason: skip tag Change-Id I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7 with SHA-1 ce8c92d956 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639654

Change-Id: Id34011ffbdd997f29140b12cae5a0caeae745d3e

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-03-23 14:03:13 +00:00
86b155f624
Merge "Have a new method in NetworkAgentConfig.Builder to set allowBypass" am: c643098b0b am: 70e7af26c4 am: bb50fd24b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649288

Change-Id: Ibc6553b1471ee8e0ab362979ba9525c2e328a275

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-23 14:02:47 +00:00
2a4d6f6d43
Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 71996469d2 am: 068f44831d am: 12b8bb5c19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068

Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-23 14:01:19 +00:00
56ad3fabe4
Merge "Fix cannot find removeUnwantedCapability on R device" am: 3ef6584f1b am: f85195ae06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302

Change-Id: Ia574c52344290f5baf5fbee90ed1f6f7c7e0f92c

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-03-23 13:29:15 +00:00
b5d62d1f83
Remove Notification.DevFlags
Fixes: 176239013
Test: manual
Change-Id: I1aeed1c79e4a829d8829eb08224f9b21fafc50fe

Jeff DeCew   commited 2021-03-23 13:28:55 +00:00
6a77410cf1