Commit Graph

4124 Commits

Author SHA1 Message Date
Chalard Jean
8e97c35976 Merge "Add a static to get the Ip Memory Store" am: bee0cbe5df am: 9f1414dac1
am: 771628aba9

Change-Id: I11e66200c4491eba9449a519f43ba89b51b9526e
2019-03-11 08:23:42 -07:00
Chalard Jean
5d8b7c875d Add a static to get the Ip Memory Store
This is so that there is some AOSP stable API while the
memory store is moved to the network.

Test: atest FrameworksNetTests
Change-Id: Ib51dbee77fcb0d14a5c85240ac711b3b1aa71286
2019-03-11 20:48:08 +09:00
Chalard Jean
201565f702 Merge "Make ParseException less useless." am: 8e8ed1dfc2 am: 55fae4c14c
am: 1f3a202559

Change-Id: I62ef12558f0923d6a4cdbddd5031a2b599a13a6c
2019-03-10 21:38:18 -07:00
Treehugger Robot
8e8ed1dfc2 Merge "Make ParseException less useless." 2019-03-11 04:06:48 +00:00
Bernie Innocenti
a7de534a93 Merge "Add junyulai@ as owner of the core networking dirs" am: e5e3ac639b am: b0498ba448
am: 6f6fc40839

Change-Id: I5902959b76797a58884480e3fd219ba53497ae8e
2019-03-09 06:04:09 -08:00
Luke Huang
e2ff3cb9fd Merge "Minor changes to the async DNS query JAVA API" am: c8dfb72891 am: 5b0b36a6b4
am: 6a047b2645

Change-Id: I5ce24db3888c9ac4e05af254aa99aae3abcb7140
2019-03-09 04:33:13 -08:00
Benedict Wong
18a4ebb257 resolve merge conflicts of 836402e0e8 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db
2019-03-08 23:45:49 +00:00
Bernie Innocenti
e5e3ac639b Merge "Add junyulai@ as owner of the core networking dirs" 2019-03-08 15:21:01 +00:00
Bernie Innocenti
ea89cf2c6e Add junyulai@ as owner of the core networking dirs
Also removed emeritus accounts ek@ and silberst@ from various places.
A cleanup using 'include' would probably be in order...

Test: N/A
Change-Id: I575e60dd5e600e42d9571ce8e8d7661d30e99bfe
2019-03-08 13:04:05 +00:00
markchien
6ea3454f07 Add tethering event callback API
Provide OnTetheringEventCallback for system app to know
tethering's upstream.

Bug: 125583822
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
2019-03-08 17:28:33 +08:00
Chalard Jean
bb1299cc18 Make ParseException less useless.
Test: None
Change-Id: I4b6d3fc8aba5a602ac06c958db41157cd98f2aff
2019-03-08 17:58:00 +09:00
Luke Huang
c8dfb72891 Merge "Minor changes to the async DNS query JAVA API" 2019-03-08 03:19:55 +00:00
Benedict Wong
cbc409986d Merge changes Ie66ba631,Ic42c09a3
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
2019-03-07 23:32:55 +00:00
Mark Chien
340107f508 Merge "Fix TetheringEntitlementValueListener related API" am: fbcc63d51f am: 16c5a5c6f4
am: 95ca226658

Change-Id: I9a1f7c9fa34b6f1e6104a8e5af4b6957e7aae3eb
2019-03-07 05:51:10 -08:00
Mark Chien
fbcc63d51f Merge "Fix TetheringEntitlementValueListener related API" 2019-03-07 13:21:53 +00:00
Luke Huang
33bfef3b54 Minor changes to the async DNS query JAVA API
1. refine the naming in DnsPacket and add more comment
2. add comment in DnsResolver

Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Ib482d079d6823fd1d9bff163427b7aad38374199
2019-03-07 16:40:49 +08:00
markchien
9554abf9ed Fix TetheringEntitlementValueListener related API
Test: -build, flash, boot
      -atest FrameworksNetTests
bug: 126701557
bug: 126392011

Change-Id: I6dda10fbfe8ffaef71269617750a22563396f5ea
2019-03-07 13:33:21 +08:00
Remi NGUYEN VAN
f72125d46d Merge "Fix SocketUtils API" am: 3da7809ae4 am: f0ef74dc7a
am: 4adf7d6a17

Change-Id: Ib2de3e87ab61a2ff4918e9dfc3ae2b012e24b5c2
2019-03-06 20:31:50 -08:00
Remi NGUYEN VAN
3da7809ae4 Merge "Fix SocketUtils API" 2019-03-07 03:54:22 +00:00
Andrei-Valentin Onea
cf03906edc Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:18:05 +00:00
Remi NGUYEN VAN
b7bda39d90 Fix SocketUtils API
- connect, sendTo, bind were added as public API, so do not need to be
   maintained as SystemApi in SocketUtils. These APIs were added in Q
   timeframe.
 - Add @Nullable/@NonNull annotations.

Bug: 126699304
Bug: 126477266
Test: booted, WiFi works
Change-Id: I3f086ac8952cfd6a4d8f861d2e1c7aa1ca8be999
2019-03-06 18:02:34 +09:00
Amit Mahajan
cee0e5935e Merge "Adding new APN type for Mission Critical Services." am: 36791ef41e am: c45dc5916a
am: aec43bb247

Change-Id: Iaa216ae164b1bbc1c27be0549bd9e19fa9803cb8
2019-03-04 11:10:07 -08:00
Amit Mahajan
36791ef41e Merge "Adding new APN type for Mission Critical Services." 2019-03-04 18:23:30 +00:00
Adam Vartanian
f15b8a042d Merge "Add @Nullable to new method" am: 70c0efdd86 am: 2948be98c2
am: a343750304

Change-Id: I743d3fae43073eebf1a9abecd45fe71456f4ab43
2019-03-04 04:19:34 -08:00
Treehugger Robot
70c0efdd86 Merge "Add @Nullable to new method" 2019-03-04 11:43:48 +00:00
Jack Yu
766f960766 Merge "Fixed all APIs not meeting API review requirement" am: a3f1b3f15d am: a0e1501981
am: bc6c8b99c9

Change-Id: I9683c9616e524013eda818e34d817d636ff1f365
2019-03-02 20:59:32 -08:00
Treehugger Robot
a3f1b3f15d Merge "Fixed all APIs not meeting API review requirement" 2019-03-03 04:27:32 +00:00
Jeff Vander Stoep
97074c931c Merge "getConnectionOwnerUid: Clarify documentation" am: 63f516d1ee am: baed6a5ed5
am: f569dff59d

Change-Id: I4861a830f974d542452fb1ea8710438cf4fec14a
2019-03-01 20:24:38 -08:00
Varun Anand
cf6784f621 Merge "Add @NonNull and @Nullable annotations to VpnService#Builder." am: 1957b624ab am: 65edc0d81d
am: 5bd46a5f9a

Change-Id: Ia5bd0ea491f378bd490ebdba2f5b53dbcd18f2c5
2019-03-01 20:12:13 -08:00
Treehugger Robot
63f516d1ee Merge "getConnectionOwnerUid: Clarify documentation" 2019-03-02 03:42:22 +00:00
Treehugger Robot
1957b624ab Merge "Add @NonNull and @Nullable annotations to VpnService#Builder." 2019-03-02 03:41:57 +00:00
Paul Duffin
fc67c0d507 Merge "Fix Automated API Review: InetAddresses" am: 4daca39083 am: 670be0f20f
am: 02fa26934d

Change-Id: I20a88429cd47bf16d7b2766fde5b978c33e9272b
2019-03-01 19:35:02 -08:00
Treehugger Robot
4daca39083 Merge "Fix Automated API Review: InetAddresses" 2019-03-02 03:05:18 +00:00
Amit Mahajan
fd3ee5783e Adding new APN type for Mission Critical Services.
Test: build
Bug: 124447962
Change-Id: I9f608badd363703394432640dc892a4465660b6d
2019-03-01 16:52:17 -08:00
Jack Yu
8eb6ca8354 Fixed all APIs not meeting API review requirement
To address the API review feedback provided by
the API council.

Bug: 126702995
Bug: 126701710
Bug: 126702357
Bug: 126701113
Bug: 126701239
Bug: 126700713
Bug: 126700064
Test: Manual
Change-Id: I4b902c1fc2c09133022b05dacdda8964436205d2
2019-03-01 14:37:47 -08:00
Varun Anand
6e81d01e91 Add @NonNull and @Nullable annotations to VpnService#Builder.
Bug: 126699070
Test: n/a
Change-Id: Ief0066636ca6ae4fefbdf70b8dfdfacf2a44e0e6
2019-03-01 11:06:47 -08:00
Dongwon Kang
4d0fb6f5dc Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6 am: a4fadcc192
am: 524cbefb5c

Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71
2019-03-01 09:56:56 -08:00
Dongwon Kang
948d11ffa6 Merge "Make Uri.toSafeString() also handle 'rtsp'" 2019-03-01 17:09:29 +00:00
Adam Vartanian
882eb1867c Add @Nullable to new method
Add @Nullable to a newly-added method, as requested by API council.

Bug: 126698875
Test: make
Change-Id: I2e72ea457b5adaceea70d9908bb8e2cac2e0d963
2019-03-01 15:07:06 +00:00
Paul Duffin
fe38d35ba7 Fix Automated API Review: InetAddresses
Add @NonNull annotations as required by the automated review.

Bug: 126702338
Test: make checkbuild
Change-Id: I9057f06de8d7ea846af00d5cefa744d4206b4b63
2019-03-01 14:06:18 +00:00
Jeff Sharkey
9e8f83db6d All Parcelable CREATOR fields are @NonNull.
If they were null, then the Parcelable would fail to work.

Bug: 126726802
Test: manual
Change-Id: I7929ffa2f20e5de1c8e68e8263cca99496e9d014
Exempt-From-Owner-Approval: Trivial API annotations
2019-02-28 23:29:04 -07:00
Benedict Wong
e40eab608a Add shell TestNetworkManager and Service
This adds the scaffolding for TestNetworkManager and TestNetworkService.
These are separate from the ConnectivityManager/ConnectivityService in
order to prevent polluting the API space, and making them harder to
maintain.

Bug: 72950854
Test: Compiles, CTS tests relying on this pass
Change-Id: Ic42c09a33d962471e2587ec27f3fab2d72bbcd42
2019-02-28 21:46:58 -08:00
Varun Anand
29dfd62110 Merge "Remove ConnectivityManager and its usages from NetworkStatsService." 2019-03-01 01:14:34 +00:00
eunyoung.moon
9c0038ebd3 Make Uri.toSafeString() also handle 'rtsp'
Bug: 123669012
Test: atest CtsNetTestCases:android.net.cts.UriTest
Change-Id: I082bdbd55589f6b99a8cf5fc68c897477f2fa792
Signed-off-by: Eunyoung Moon <eunyoung.moon@lge.com>
2019-02-28 16:53:40 -08:00
Varun Anand
d33cbc6f5f Remove ConnectivityManager and its usages from NetworkStatsService.
NSS needed it for getting VpnInfo[], NetworkState[] and
activeLinkProperties which it used to query via ConnectivityManager.

For VpnInfo[], this was racy as NSS may ignore intermediate changes to a
VPN's underlying networks. See http://b/123961098 for more context.

It may also lead to deadlocks b/w ConnectivityService and
NetworkStatsService. See http://b/126245192 for more info.

This change will ensure that NSS is never contending on any of
ConnectivityService locks.

Bug: 123961098
Bug: 126245192
Bug: 120145746
Test: atest FrameworksNetTests
Change-Id: Id1da446b54d95ee68ed14079107b1a10318bcf8b
Merged-In: I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6
2019-03-01 00:10:52 +00:00
Varun Anand
02c50ef1d1 Remove ConnectivityManager and its usages from NetworkStatsService.
NSS needed it for getting VpnInfo[], NetworkState[] and
activeLinkProperties which it used to query via ConnectivityManager.

For VpnInfo[], this was racy as NSS may ignore intermediate changes to a
VPN's underlying networks. See http://b/123961098 for more context.

It may also lead to deadlocks b/w ConnectivityService and
NetworkStatsService. See http://b/126245192 for more info.

This change will ensure that NSS is never contending on any of
ConnectivityService locks.

Bug: 123961098
Bug: 126245192
Bug: 120145746
Test: atest FrameworksNetTests
Change-Id: I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6
2019-02-28 13:43:02 -08:00
Andrei Onea
efd37eff41 Add @UnsupportedAppUsage annotations
For packages:
  android.net
  android.net.wifi
  android.nfc

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04
Change-Id: I16570aef456b45a5543bf889dddc7a0d25441928
2019-02-28 14:39:20 +00:00
Chiachang Wang
1553a39528 Merge "Fix broken javadoc links" am: 5eae14aa54 am: 2c8c5928ab
am: dc72c37926

Change-Id: Iffb9cfe0928ed37db61a7f684acb2b41b74c1bfa
2019-02-28 06:05:10 -08:00
Andrei-Valentin Onea
34ccde884d Merge "Add @UnsupportedAppUsage annotations" 2019-02-28 13:50:19 +00:00
Treehugger Robot
5eae14aa54 Merge "Fix broken javadoc links" 2019-02-28 13:34:52 +00:00