LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,105 Commits 2 Branches 0 Tags
d61e4e4e61e884ea21a922b11b70fc189ff2fa8e
Commit Graph

6105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Varun Anand
d61e4e4e61 [automerger skipped] Merge "Revert "Update VPN capabilities when its underlying network set is null."" into pi-dev am: aa7b93b167 -s ours 
am: 53b66bee29 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 273f900b3b is in history

Change-Id: I0fe32cb678b7ee9b7ac79bd0efa4bdec3598ce8b
 2019-03-07 17:17:39 -08:00
Varun Anand
53b66bee29 [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 273f900b3b is in history

Change-Id: I0789a8deb45a949c8734fc317cd3d6d8a452d1d1
 2019-03-07 16:21:09 -08:00
Mark Chien
0bdfaa802b Merge "Fix TetheringEntitlementValueListener related API" am: e2f15a176f am: 4ccb25bfa3 
am: e432b14e7a

Change-Id: I9a1f7c9fa34b6f1e6104a8e5af4b6957e7aae3eb
 2019-03-07 05:51:10 -08:00
Mark Chien
e432b14e7a Merge "Fix TetheringEntitlementValueListener related API" am: e2f15a176f 
am: 4ccb25bfa3

Change-Id: Id85e5499e15b9b244c212a44ca79587b27c9c016
 2019-03-07 05:41:46 -08:00
Mark Chien
4ccb25bfa3 Merge "Fix TetheringEntitlementValueListener related API" 
am: e2f15a176f

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

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
b0fcda5054 Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 216266b524 am: 36e7b25aea 
am: 5633b0c200

Change-Id: I01657671712799f5a29a3a7530430cc5bfb14f41
 2019-03-06 22:10:32 -08:00
Brett Chabot
5633b0c200 Merge "Migrate frameworks/base/tests/net/ to androidx.test" am: 216266b524 
am: 36e7b25aea

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

Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
 2019-03-06 21:51:50 -08:00
Treehugger Robot
216266b524 Merge "Migrate frameworks/base/tests/net/ to androidx.test" 2019-03-07 05:42:07 +00:00
markchien
dd41c82056 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
675f787394 [automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 298325342e am: 291d748aff 
am: 49d90d8b68 -s ours
am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1 734999cff8 is in history

Change-Id: Ic26a760f7e86a4f8e2911bc4d57509bfb574f447
 2019-03-06 10:26:13 -08:00
Andrei-Valentin Onea
49d90d8b68 Merge "Add @UnsupportedAppUsage annotations" am: 298325342e 
am: 291d748aff

Change-Id: Id5ba379057d3874b78391c312cfb903799617d81
 2019-03-06 09:57:27 -08:00
Andrei-Valentin Onea
291d748aff Merge "Add @UnsupportedAppUsage annotations" 
am: 298325342e

Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239
 2019-03-06 09:41:34 -08:00
Andrei-Valentin Onea
298325342e Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:18:05 +00:00
Brett Chabot
ab11bf1f20 Migrate frameworks/base/tests/net/ to androidx.test 
Test: atest FrameworksNetTests
Change-Id: Iaa59d606f5e1678cc5aaca9ed37e184fad894e5d
 2019-03-05 09:05:47 -08:00
Varun Anand
2484e523c7 Merge "Fix isActiveNetworkMetered for VPNs." am: 9fd6a19bb0 am: b6b97bb8c3 
am: 8f8af9b629

Change-Id: I3d536324052227bbfab31ba5d608c35ecb9b1ab5
 2019-03-04 18:09:07 -08:00
Varun Anand
8f8af9b629 Merge "Fix isActiveNetworkMetered for VPNs." am: 9fd6a19bb0 
am: b6b97bb8c3

Change-Id: I9a1acc5850245b5c5f0ca13d03f368fb4a0d2fa9
 2019-03-04 18:00:27 -08:00
Varun Anand
b6b97bb8c3 Merge "Fix isActiveNetworkMetered for VPNs." 
am: 9fd6a19bb0

Change-Id: Ic219c083dffa426a8c6f548ff6a3f4b5c2555217
 2019-03-04 17:50:43 -08:00
Varun Anand
9fd6a19bb0 Merge "Fix isActiveNetworkMetered for VPNs." 2019-03-05 01:37:30 +00:00
Amit Mahajan
b66c20f135 Merge "Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 am: 819aaec930" into pi-dev-plus-aosp 
am: 01eeb382d9

Change-Id: I18dfbcea14211e069fc5698c36e111c89abfc3ac
 2019-03-04 11:36:09 -08:00
Amit Mahajan
ec9e7a07e9 Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 am: 819aaec930 
am: 508c836dd5

Change-Id: Iaa216ae164b1bbc1c27be0549bd9e19fa9803cb8
 2019-03-04 11:10:07 -08:00
Android Build Merger (Role)
01eeb382d9 Merge "Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 am: 819aaec930" into pi-dev-plus-aosp 2019-03-04 19:03:21 +00:00
Amit Mahajan
4b09a183c7 Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 
am: 819aaec930

Change-Id: Iab925fcbad4dd505021c4bf5345a4b2714f2fba3
 2019-03-04 11:02:30 -08:00
Amit Mahajan
508c836dd5 Merge "Adding new APN type for Mission Critical Services." am: c4d867c5e3 
am: 819aaec930

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

Change-Id: I4ae43791c9444f792d69e27b76a5bf57f8dfb4c8
 2019-03-04 10:43:30 -08:00
Amit Mahajan
c4d867c5e3 Merge "Adding new APN type for Mission Critical Services." 2019-03-04 18:23:30 +00:00
Mark Chien
37e20d0a1d Merge "Return not supported if no necessary socket option" am: 719b872bfe am: 857c29a147 
am: f641f82feb

Change-Id: I46918a026f547ebd8a001a1e4dba2881cf6dd134
 2019-03-04 01:46:47 -08:00
Mark Chien
f641f82feb Merge "Return not supported if no necessary socket option" am: 719b872bfe 
am: 857c29a147

Change-Id: I58b49eab495b6b949368f86f5dd32bfc507d4141
 2019-03-04 01:37:26 -08:00
Mark Chien
857c29a147 Merge "Return not supported if no necessary socket option" 
am: 719b872bfe

Change-Id: I592d08040459e544a53861b4e8a0ee49a50f225b
 2019-03-04 01:28:12 -08:00
Mark Chien
719b872bfe Merge "Return not supported if no necessary socket option" 2019-03-04 09:16:07 +00:00
Jack Yu
11db51010c Merge "Fixed all APIs not meeting API review requirement" am: a4c326157c am: 48ed523a6d 
am: 93991029c5

Change-Id: I9683c9616e524013eda818e34d817d636ff1f365
 2019-03-02 20:59:32 -08:00
Jack Yu
93991029c5 Merge "Fixed all APIs not meeting API review requirement" am: a4c326157c 
am: 48ed523a6d

Change-Id: I4fceb789ebcfff76cc0205889e9c5084c83d4471
 2019-03-02 20:50:08 -08:00
Jack Yu
48ed523a6d Merge "Fixed all APIs not meeting API review requirement" 
am: a4c326157c

Change-Id: I84c1b55e99bf89c818c365f4954d9e3921904636
 2019-03-02 20:40:56 -08:00
Treehugger Robot
a4c326157c Merge "Fixed all APIs not meeting API review requirement" 2019-03-03 04:27:32 +00:00
Lorenzo Colitti
f24cb3793d Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: bfe05b0388 am: e8e44c0a75 
am: 7587fe6683

Change-Id: I507dfcdef170cfb02084899891308b078a6700de
 2019-03-01 22:16:19 -08:00
Lorenzo Colitti
7587fe6683 Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: bfe05b0388 
am: e8e44c0a75

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

Change-Id: I46e448611a23a9e75f05b0ab48d4af47175de6d4
 2019-03-01 21:58:39 -08:00
Treehugger Robot
bfe05b0388 Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." 2019-03-02 05:38:21 +00:00
Jeff Vander Stoep
6094312256 Merge "getConnectionOwnerUid: Clarify documentation" am: 1a4ffd5df1 am: 579402391a 
am: 0b9ba97454

Change-Id: I4861a830f974d542452fb1ea8710438cf4fec14a
 2019-03-01 20:24:38 -08:00
Jeff Vander Stoep
0b9ba97454 Merge "getConnectionOwnerUid: Clarify documentation" am: 1a4ffd5df1 
am: 579402391a

Change-Id: I6897d552ed0a3f6ab6ac3616193fc4442cadc05a
 2019-03-01 20:10:48 -08:00
Jeff Vander Stoep
579402391a Merge "getConnectionOwnerUid: Clarify documentation" 
am: 1a4ffd5df1

Change-Id: I6d469968754a355871655f0a29c75e7305874bc3
 2019-03-01 19:56:05 -08:00
Treehugger Robot
1a4ffd5df1 Merge "getConnectionOwnerUid: Clarify documentation" 2019-03-02 03:42:22 +00:00
Paul Duffin
935a1c5dd9 Merge "Fix Automated API Review: InetAddresses" am: 4daca39083 am: 1c0dc70654 
am: e137413db2

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

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

Change-Id: I0125d756d2026656afca9e29b7963c0e724750ac
 2019-03-01 19:15:54 -08:00
Amit Mahajan
44f8255974 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
3ee7ba172e 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
3b6665ecac 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