Commit Graph

6087 Commits

Author SHA1 Message Date
Varun Anand
3668aa0dd7 Merge "Fix isActiveNetworkMetered for VPNs." am: 8cf699851a am: cb011b799f
am: 08bd075e35

Change-Id: I3d536324052227bbfab31ba5d608c35ecb9b1ab5
2019-03-04 18:09:07 -08:00
Varun Anand
08bd075e35 Merge "Fix isActiveNetworkMetered for VPNs." am: 8cf699851a
am: cb011b799f

Change-Id: I9a1acc5850245b5c5f0ca13d03f368fb4a0d2fa9
2019-03-04 18:00:27 -08:00
Varun Anand
cb011b799f Merge "Fix isActiveNetworkMetered for VPNs."
am: 8cf699851a

Change-Id: Ic219c083dffa426a8c6f548ff6a3f4b5c2555217
2019-03-04 17:50:43 -08:00
Varun Anand
8cf699851a Merge "Fix isActiveNetworkMetered for VPNs." 2019-03-05 01:37:30 +00:00
Amit Mahajan
6c2c273623 Merge "Merge "Adding new APN type for Mission Critical Services." am: a32315e69a am: 65bde4b9a0" into pi-dev-plus-aosp
am: f80592e594

Change-Id: I18dfbcea14211e069fc5698c36e111c89abfc3ac
2019-03-04 11:36:09 -08:00
Amit Mahajan
2de8d9415a Merge "Adding new APN type for Mission Critical Services." am: a32315e69a am: 65bde4b9a0
am: 45f927af1e

Change-Id: Iaa216ae164b1bbc1c27be0549bd9e19fa9803cb8
2019-03-04 11:10:07 -08:00
Android Build Merger (Role)
f80592e594 Merge "Merge "Adding new APN type for Mission Critical Services." am: a32315e69a am: 65bde4b9a0" into pi-dev-plus-aosp 2019-03-04 19:03:21 +00:00
Amit Mahajan
72300fc758 Merge "Adding new APN type for Mission Critical Services." am: a32315e69a
am: 65bde4b9a0

Change-Id: Iab925fcbad4dd505021c4bf5345a4b2714f2fba3
2019-03-04 11:02:30 -08:00
Amit Mahajan
45f927af1e Merge "Adding new APN type for Mission Critical Services." am: a32315e69a
am: 65bde4b9a0

Change-Id: I374b11d4300e31aea7143307f1e8b9eb4c300ae1
2019-03-04 10:54:19 -08:00
Amit Mahajan
65bde4b9a0 Merge "Adding new APN type for Mission Critical Services."
am: a32315e69a

Change-Id: I4ae43791c9444f792d69e27b76a5bf57f8dfb4c8
2019-03-04 10:43:30 -08:00
Amit Mahajan
a32315e69a Merge "Adding new APN type for Mission Critical Services." 2019-03-04 18:23:30 +00:00
Mark Chien
a5a6c8f0ae Merge "Return not supported if no necessary socket option" am: acb289f34e am: 06477f2f37
am: d7f826eb7b

Change-Id: I46918a026f547ebd8a001a1e4dba2881cf6dd134
2019-03-04 01:46:47 -08:00
Mark Chien
d7f826eb7b Merge "Return not supported if no necessary socket option" am: acb289f34e
am: 06477f2f37

Change-Id: I58b49eab495b6b949368f86f5dd32bfc507d4141
2019-03-04 01:37:26 -08:00
Mark Chien
06477f2f37 Merge "Return not supported if no necessary socket option"
am: acb289f34e

Change-Id: I592d08040459e544a53861b4e8a0ee49a50f225b
2019-03-04 01:28:12 -08:00
Mark Chien
acb289f34e Merge "Return not supported if no necessary socket option" 2019-03-04 09:16:07 +00:00
Jack Yu
0b5569af6f Merge "Fixed all APIs not meeting API review requirement" am: 37cde6b81d am: 75d5f94bb5
am: 2313596576

Change-Id: I9683c9616e524013eda818e34d817d636ff1f365
2019-03-02 20:59:32 -08:00
Jack Yu
2313596576 Merge "Fixed all APIs not meeting API review requirement" am: 37cde6b81d
am: 75d5f94bb5

Change-Id: I4fceb789ebcfff76cc0205889e9c5084c83d4471
2019-03-02 20:50:08 -08:00
Jack Yu
75d5f94bb5 Merge "Fixed all APIs not meeting API review requirement"
am: 37cde6b81d

Change-Id: I84c1b55e99bf89c818c365f4954d9e3921904636
2019-03-02 20:40:56 -08:00
Treehugger Robot
37cde6b81d Merge "Fixed all APIs not meeting API review requirement" 2019-03-03 04:27:32 +00:00
Lorenzo Colitti
d464ac25e4 Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: 57ca4b2743 am: dc987ea9e3
am: aa5da2303c

Change-Id: I507dfcdef170cfb02084899891308b078a6700de
2019-03-01 22:16:19 -08:00
Lorenzo Colitti
aa5da2303c Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: 57ca4b2743
am: dc987ea9e3

Change-Id: I14555061639da3b04b4bca74c692ac94e5713c74
2019-03-01 22:06:58 -08:00
Lorenzo Colitti
dc987ea9e3 Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread."
am: 57ca4b2743

Change-Id: I46e448611a23a9e75f05b0ab48d4af47175de6d4
2019-03-01 21:58:39 -08:00
Treehugger Robot
57ca4b2743 Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." 2019-03-02 05:38:21 +00:00
Jeff Vander Stoep
879c396fec Merge "getConnectionOwnerUid: Clarify documentation" am: 72a6706e8b am: 563f40fb7f
am: f26bffe73f

Change-Id: I4861a830f974d542452fb1ea8710438cf4fec14a
2019-03-01 20:24:38 -08:00
Jeff Vander Stoep
f26bffe73f Merge "getConnectionOwnerUid: Clarify documentation" am: 72a6706e8b
am: 563f40fb7f

Change-Id: I6897d552ed0a3f6ab6ac3616193fc4442cadc05a
2019-03-01 20:10:48 -08:00
Jeff Vander Stoep
563f40fb7f Merge "getConnectionOwnerUid: Clarify documentation"
am: 72a6706e8b

Change-Id: I6d469968754a355871655f0a29c75e7305874bc3
2019-03-01 19:56:05 -08:00
Treehugger Robot
72a6706e8b Merge "getConnectionOwnerUid: Clarify documentation" 2019-03-02 03:42:22 +00:00
Paul Duffin
22b9062704 Merge "Fix Automated API Review: InetAddresses" am: 4daca39083 am: cd8d86ab93
am: 0be0a4138e

Change-Id: I20a88429cd47bf16d7b2766fde5b978c33e9272b
2019-03-01 19:35:02 -08:00
Paul Duffin
0be0a4138e Merge "Fix Automated API Review: InetAddresses" am: 4daca39083
am: cd8d86ab93

Change-Id: Ibcef646f539b1a871d8521d7216ecb6f7df8c0fd
2019-03-01 19:25:24 -08:00
Paul Duffin
cd8d86ab93 Merge "Fix Automated API Review: InetAddresses"
am: 4daca39083

Change-Id: I0125d756d2026656afca9e29b7963c0e724750ac
2019-03-01 19:15:54 -08:00
Amit Mahajan
b7aafd26aa 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
9fc82e3a86 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
Paul Duffin
e59e8c6255 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
f8525286b4 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
3f297f17e9 [automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am: 93dfa10da4 am: 9e3e89cde6
am: b5865254fd -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1 45406bff69 is in history

Change-Id: I3ddc59f7abb5e3c0a2f4f54bb68632578948ee89
2019-02-28 19:35:07 -08:00
Varun Anand
b5865254fd Merge "Remove ConnectivityManager and its usages from NetworkStatsService." am: 93dfa10da4
am: 9e3e89cde6

Change-Id: Ieb10b88344dd4436913426961e6999577a469f36
2019-02-28 19:25:53 -08:00
Varun Anand
9e3e89cde6 Merge "Remove ConnectivityManager and its usages from NetworkStatsService."
am: 93dfa10da4

Change-Id: I2a2809d3a2ee4106cc131d61ace401f31c187844
2019-02-28 19:18:33 -08:00
Varun Anand
c839241101 Merge "Remove ConnectivityManager and its usages from NetworkStatsService." 2019-03-01 01:14:34 +00:00
Varun Anand
f3fd8dd454 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
45406bff69 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
Varun Anand
83b6d76c93 Fix isActiveNetworkMetered for VPNs.
This change is basically a revert of http://ag/3580901.
It was made because previously VPN capabilities did not use to update
based on its underlying networks. That is no longer the case anymore.

This was previously returning meteredness on the basis of VPN's first
underlying network which is incorrect in cases such as VPN using
multiple underlying networks, or VPN that has explicitly marked itself
as metered via VpnService.Builder#setMetered API.

Bug: 123936838
Test: atest FrameworksNetTests
Change-Id: Ia54b8570fbad4a638a6d43a95e0271c6baf66685
2019-02-28 13:18:11 -08:00
Chiachang Wang
f255780123 Merge "Fix broken javadoc links" am: 1dd83b17a9 am: 83fa25b925
am: 5e1d1a5252

Change-Id: Iffb9cfe0928ed37db61a7f684acb2b41b74c1bfa
2019-02-28 06:05:10 -08:00
Chiachang Wang
5e1d1a5252 Merge "Fix broken javadoc links" am: 1dd83b17a9
am: 83fa25b925

Change-Id: I6423d51b19dd70a3e8a35841944d0c9c2a151768
2019-02-28 05:55:38 -08:00
Andrei-Valentin Onea
fe1d3d7a51 Merge "Add @UnsupportedAppUsage annotations" 2019-02-28 13:50:19 +00:00
Chiachang Wang
83fa25b925 Merge "Fix broken javadoc links"
am: 1dd83b17a9

Change-Id: I7f1ef96544450ae71af3b76783fcbdc7641a2d43
2019-02-28 05:46:29 -08:00
Treehugger Robot
1dd83b17a9 Merge "Fix broken javadoc links" 2019-02-28 13:34:52 +00:00
Lorenzo Colitti
a777182a7b Merge changes from topic "nat64" am: 868f0589c8 am: 17fdfe9945
am: 3998251274

Change-Id: Iffd1a988d631c9285bad232cc60ae321abc866e8
2019-02-27 16:37:43 -08:00
Lorenzo Colitti
3998251274 Merge changes from topic "nat64" am: 868f0589c8
am: 17fdfe9945

Change-Id: Iac01497eda611d334ee0ec2440f7d9f8bd27bd1f
2019-02-27 16:10:58 -08:00
Lorenzo Colitti
17fdfe9945 Merge changes from topic "nat64"
am: 868f0589c8

Change-Id: I3f7f74c197dd5da3db7d8d41fa4a26aacf38c2e8
2019-02-27 15:56:18 -08:00
Lorenzo Colitti
868f0589c8 Merge changes from topic "nat64"
* changes:
  Catch ServiceSpecificException instead of IllegalStateException.
  Manage NAT64 prefix discovery lifecycle in the framework.
  Track NAT64 in the framework and start clatd iff NAT64 detected
  Change Nat464Xlat lifecycle.
  Minor improvements to verifyTcpBufferSizeChange.
2019-02-27 23:37:42 +00:00