Commit Graph

6106 Commits

Author SHA1 Message Date
markchien
20f6eea87c 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
Varun Anand
6ca16039aa [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev am: aa7b93b167 -s ours
am: b3c5bf1be0 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I0fe32cb678b7ee9b7ac79bd0efa4bdec3598ce8b
2019-03-07 17:17:39 -08:00
Varun Anand
b3c5bf1be0 [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev
am: aa7b93b167 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 df56995870 is in history

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
2019-03-07 16:21:09 -08:00
Mark Chien
f8279fdf25 Merge "Fix TetheringEntitlementValueListener related API" am: cdfb2b941d am: 71894fbf14
am: ae8e49de86

Change-Id: I9a1f7c9fa34b6f1e6104a8e5af4b6957e7aae3eb
2019-03-07 05:51:10 -08:00
Mark Chien
ae8e49de86 Merge "Fix TetheringEntitlementValueListener related API" am: cdfb2b941d
am: 71894fbf14

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016
2019-03-07 05:41:46 -08:00
Mark Chien
71894fbf14 Merge "Fix TetheringEntitlementValueListener related API"
am: cdfb2b941d

Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
2019-03-07 05:32:33 -08:00
Mark Chien
cdfb2b941d Merge "Fix TetheringEntitlementValueListener related API" 2019-03-07 13:21:53 +00:00
Varun Anand
c0e7f75e70 Revert "Update VPN capabilities when its underlying network set is null."
This reverts commit bfabfe0ab3.

Bug: 126245192

Reason for revert: This change can lead to a deadlock that was fixed in http://ag/6580635. However, platform PMs think that fixing this is risky enough as this is not a recent problem and has been in the field for 3/4 of the year.

Note: The merged-in tag is used to avoid this change from getting merged into pi-dev-plus-aosp. This is to avoid merge conflicts since we mostly work in aosp/master which merges into pi-dev-plus-aosp.

Change-Id: I3814bcec87efb059f50f00617406501aaeac3b4d
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
2019-03-07 06:13:03 +00:00
Brett Chabot
8e95e2105d Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: e69a7a1554 am: 29e6ab8d01
am: 38f02479d6

Change-Id: I01657671712799f5a29a3a7530430cc5bfb14f41
2019-03-06 22:10:32 -08:00
Brett Chabot
38f02479d6 Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: e69a7a1554
am: 29e6ab8d01

Change-Id: I88b55d65728e366e2ffd1336e28da4a879b2d5a2
2019-03-06 22:01:10 -08:00
Brett Chabot
29e6ab8d01 Merge "Migrate frameworks/base/tests/net/ to androidx.test"
am: e69a7a1554

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
2019-03-06 21:51:50 -08:00
Treehugger Robot
e69a7a1554 Merge "Migrate frameworks/base/tests/net/ to androidx.test" 2019-03-07 05:42:07 +00:00
markchien
bf5ab01869 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
Andrei-Valentin Onea
eb4dee0b99 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 7e3ccaa77a am: 1504da0942
am: f3423582fe -s ours
am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1 bb27866cfb is in history

Change-Id: Ic26a760f7e86a4f8e2911bc4d57509bfb574f447
2019-03-06 10:26:13 -08:00
Andrei-Valentin Onea
f3423582fe Merge "Add @UnsupportedAppUsage annotations" am: 7e3ccaa77a
am: 1504da0942

Change-Id: Id5ba379057d3874b78391c312cfb903799617d81
2019-03-06 09:57:27 -08:00
Andrei-Valentin Onea
1504da0942 Merge "Add @UnsupportedAppUsage annotations"
am: 7e3ccaa77a

Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239
2019-03-06 09:41:34 -08:00
Andrei-Valentin Onea
7e3ccaa77a Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:18:05 +00:00
Brett Chabot
147f6cf341 Migrate frameworks/base/tests/net/ to androidx.test
Test: atest FrameworksNetTests
Change-Id: Iaa59d606f5e1678cc5aaca9ed37e184fad894e5d
2019-03-05 09:05:47 -08:00
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