Commit Graph

4101 Commits

Author SHA1 Message Date
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
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
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
Jeff Vander Stoep
b58d3fea26 getConnectionOwnerUid: Clarify documentation
Test: build
Bug: 117573763
Change-Id: Ia899a541987b9c72a83287ed69fc47ab4d38f680
2019-02-27 13:37:37 -08:00
Andrei Onea
9a8b6bf0f1 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
Change-Id: I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04
2019-02-27 13:31:33 +00:00
Adam Vartanian
9ab49fe506 Merge "Use public APIs instead of Conscrypt ones" am: 1b9adbfdd1 am: dc310b7ccd
am: ea09b91109

Change-Id: I15a9439429c474288d4008d1571a9a5a9314cf14
2019-02-27 05:02:39 -08:00
Chiachang Wang
90882258ed Fix broken javadoc links
Bug: 123683994
Test: Verify with javadoc
Change-Id: I4b1b936e3cf86104ace5fcb6829778710801f2d5
2019-02-27 17:18:40 +08:00
Treehugger Robot
1b9adbfdd1 Merge "Use public APIs instead of Conscrypt ones" 2019-02-27 09:01:03 +00:00
Irina Dumitrescu
074a1c25b4 Merge "Add @NonNull annotation to set proxy on VPN parameter." am: 909baeddfa am: 121dab8e6b
am: 64f39de1de

Change-Id: Id84b4881dcfeb83d1faf55b7f1220b84efe63860
2019-02-26 22:28:10 -08:00
Irina Dumitrescu
5155a2d7e4 Add @NonNull annotation to set proxy on VPN parameter.
Test: manual
Bug: 124883120
Change-Id: Ifb4bd98a69a006220b1a824033395fc6f12ea6ce
2019-02-27 01:06:00 +00:00
Adam Vartanian
19254043ae Use public APIs instead of Conscrypt ones
Use the equivalent public APIs on SSLContext instead of reaching into
OpenSSLContextImpl, except for the one place where a
Conscrypt-specific API is needed.

Bug: 123738844
Bug: 119752589
Test: cts -m CtsLibcoreTestCases
Test: atest android.net.SSLCertificateSocketFactoryTest
Change-Id: I61aebac4ad713b8ce53a47e72def0c537b4ab1c9
2019-02-26 09:28:35 +00:00
Chiachang Wang
c704edbe44 Merge "Add more test case and some clean up" am: a0e4349794 am: 2a93421b60
am: f6bfc13b5f

Change-Id: Ifd358733c264d31455ff8ad70cee25b8f02825f7
2019-02-26 00:42:19 -08:00
Chiachang Wang
95489ca49e Add more test case and some clean up
Bug: 120452078
Test: atest NetworkStackTests
Change-Id: Ifb981ccdaa7818bf2bebec98e91979007222910b
2019-02-26 11:32:18 +08:00
Etan Cohen
272ed7536e Merge "[CS] Support "instant failure" from factories" 2019-02-22 14:29:39 +00:00
Remi NGUYEN VAN
33241a394f Merge "Fix framework and NetworkStack classes conflicts" am: 3f23efdd13 am: 2d7e53ca90
am: 6ce7de5e64

Change-Id: I4d943c592ae5c8b27be29857243e62e19c350549
2019-02-15 17:16:33 -08:00
Remi NGUYEN VAN
2d7e53ca90 Merge "Fix framework and NetworkStack classes conflicts"
am: 3f23efdd13

Change-Id: I8c207040c42a3d02b8383e13a4f839c250788f58
2019-02-15 16:38:52 -08:00
Remi NGUYEN VAN
3f23efdd13 Merge "Fix framework and NetworkStack classes conflicts" 2019-02-16 00:22:29 +00:00
Remi NGUYEN VAN
51490ad0fa Merge "Move NetworkStack to services.net"
am: 762f9f0c24

Change-Id: Iab45985aedb8069ad50fd2913ef6e828989cdd0d
2019-02-15 03:01:11 -08:00
Remi NGUYEN VAN
762f9f0c24 Merge "Move NetworkStack to services.net" 2019-02-15 10:52:03 +00:00
Remi NGUYEN VAN
1b57e8e9db Fix framework and NetworkStack classes conflicts
Classes that are used in framework.jar cannot be linked in NetworkStack,
as the framework takes precedence in the classpath. This prevents the
networkstack from using these classes due to the hidden API usage
detection.

Do the following:
 - jarjar any shared source file between framework and NetworkStack, so
   the version in the NetworkStack uses a different package.
 - Move any shared class not used in the NetworkStack to services.net

The CL  uses jarjar on the app copy and not the framework classes, as
the framework cannot be updated without an OTA, and non-network stack
specific classes should not be renamed because of the network stack.

Test: atest FrameworksNetTests NetworkStackTests
Test: flashed svelte build, WiFi works
Bug: 124033493
Change-Id: I85d888b756adc28c36638913632bfdfdbf0e0486
2019-02-15 17:30:07 +09:00
Remi NGUYEN VAN
8a4908c1ab Merge "Remove NetworkMonitor dependency on ICaptivePortal"
am: bfe928d593

Change-Id: Ia0d06e1aa931cdc1c6dd4008e804a6a44ae2304f
2019-02-15 00:26:34 -08:00
Remi NGUYEN VAN
bfe928d593 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 08:09:29 +00:00
Remi NGUYEN VAN
584b1378a8 Merge "Move NetworkStack to services.net" 2019-02-15 07:25:09 +00:00
Remi NGUYEN VAN
6616e2ab5d Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 05:39:14 +00:00
Remi NGUYEN VAN
ddd14b357d Merge "Remove deps from framework on netd interfaces"
am: d36e3df7b0

Change-Id: I341533244d9c7cd2c1cf8315f0806695310ba03c
2019-02-14 19:29:49 -08:00
Remi NGUYEN VAN
5db454c28d Move NetworkStack to services.net
NetworkStack is only used in services.net or clients of services.net. It
cannot stay in framework.jar because it needs to depend on AIDL
interfaces, which would conflict with app implementations if they were
in framework.jar.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: Ib1d08a3669983640119d008db7e2990fa798724f
Merged-In: I501b125a388c1100c2182bde4670944c2f0d7a02
2019-02-15 12:20:17 +09:00