LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,631 Commits 2 Branches 0 Tags
0df7210cf4e6531293b888ce2a4e57c2c2c77c56
Commit Graph

14631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Huang
0df7210cf4 Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac am: 0f2b3c67e7 am: 57a82edf0b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I8460ed44fb1bc72a8533d2e57012ccc623f8ca73
 2021-04-16 08:47:59 +00:00
Aaron Huang
57a82edf0b Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac am: 0f2b3c67e7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I2821348230f093569e8149779a88d31ce2b0b322
 2021-04-16 08:12:18 +00:00
Aaron Huang
0f2b3c67e7 Merge "Handle null pointer cases in ConnectivityService" am: 7b38530eac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669646

Change-Id: I30a02b57b58cbd3197faa614d036daec7ff06bd6
 2021-04-16 07:29:00 +00:00
Aaron Huang
7b38530eac Merge "Handle null pointer cases in ConnectivityService" 2021-04-16 07:06:37 +00:00
Chiachang Wang
f7538615c1 Merge "Extend framework-connectivity.impl visibility" into sc-dev 2021-04-16 01:13:34 +00:00
Aaron Huang
6a16a415d9 Handle null pointer cases in ConnectivityService 
If a method is called by adb command "service call"
with no parameters. It will cause to crash because
of a null object reference.

Add a null check for them to avoid system server crash.

Bug: 172885426
Test: FrameworksNetTest
      adb shell service call connectivity #
Change-Id: I8748fc5c6a7a6e82db3581e3026a3f75909a357e
 2021-04-16 00:15:25 +08:00
Junyu Lai
e3bad0320d Merge "[VCN20] Change requestBackgroundNetwork argument order" into sc-dev 2021-04-15 15:57:42 +00:00
Chiachang Wang
d6e6d52028 Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 am: d9f6d6e397 am: 965b73b955 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
 2021-04-15 13:16:16 +00:00
Chiachang Wang
965b73b955 Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 am: d9f6d6e397 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d
 2021-04-15 12:46:41 +00:00
Chiachang Wang
d9f6d6e397 Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676435

Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af
 2021-04-15 11:53:02 +00:00
Chiachang Wang
7e1afe7650 Merge "Remove hidden method link in public addRoute API" 2021-04-15 11:26:41 +00:00
Treehugger Robot
2a80f49be8 Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e am: dc05bc9aa7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: Ib65cdc3ebbde42c2ba68880b2895b0bc3db5c022
 2021-04-15 11:22:08 +00:00
Treehugger Robot
dc05bc9aa7 Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 am: 7f7769b82e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: I03024cb93ea05cccb7ec43a19c3430ef20637eeb
 2021-04-15 10:54:23 +00:00
TreeHugger Robot
6318c5aef2 Merge "Add documentation" into sc-dev 2021-04-15 10:52:46 +00:00
junyulai
56ed9a3349 [VCN20] Change requestBackgroundNetwork argument order 
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Ignore-AOSP-First: avoid build break caused by multipatch automerge
Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb
 2021-04-15 18:43:48 +08:00
Treehugger Robot
7f7769b82e Merge "Add test for [set|is]BypassableVpn" am: 3fbec7cf77 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676426

Change-Id: Ia433edec97f3a02c95dcf89f9f8ae80244063a89
 2021-04-15 10:01:20 +00:00
Chalard Jean
ab6ae44092 Add documentation 
Bug: 185121472
Test: doc-only change
Change-Id: I5fd68b209959043f6fe15ac34629c51233fea596
 2021-04-15 18:07:56 +09:00
Chiachang Wang
9ebe6cfeb3 Remove hidden method link in public addRoute API 
The build will complain after moving connectivity framework code
outside framework because the hidden methods/members accesses are
not allowed anymore. Link to a hidden class will not work since
it's not visible in public.

Bug: 182859030
Test: make docs
Change-Id: I5726f80be7cf92b648ce851d9601d5f58bc2b647
 2021-04-15 16:21:00 +08:00
lucaslin
df2a314d6c Add test for [set|is]BypassableVpn 
Bug: 182963397
Test: 1. atest CtsNetTestCases:NetworkAgentConfigTest
      2. atest CtsNetTestCasesLatestSdk:NetworkAgentConfigTest
Change-Id: I0250a0313d3a7561ab8efa851fbc06f5bce11185
 2021-04-15 15:44:01 +08:00
Chiachang Wang
7158b6dab0 Extend framework-connectivity.impl visibility 
Allow netlegacy22.api to use hidden connectivity methods.

Bug: 182859030
Test: m
Change-Id: I92936afb9fb533ea3b426490eb9617389f99fc8b
 2021-04-15 13:06:39 +08:00
Junyu Lai
73aa6487df Merge "Allow network providers to set the linger duration." into sc-dev 2021-04-15 03:23:53 +00:00
Chalard Jean
aac20e132d Merge "Use filter from CollectionUtils." into sc-dev 2021-04-14 12:38:01 +00:00
Chalard Jean
e634b28204 Allow network providers to set the linger duration. 
Test: atest CtsNetTestCases:NetworkAgentTest#testSetLingerDuration
Ignore-AOSP-First: prevent merge conflict
CTS-Coverage-Bug: 184796264
Bug: 184227264
Change-Id: I7f420faa40863385114705d6971cf00887d03318
 2021-04-14 20:26:12 +08:00
Bill Yi
14e9acc88d [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours am: 3b8115928b -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888

Change-Id: Ie382825bbc4a1b0cda64fe7a118dd6066b2cae7c
 2021-04-14 07:16:31 +00:00
Bill Yi
3b8115928b [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours am: 7771a62ab1 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888

Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
 2021-04-14 06:31:20 +00:00
Bill Yi
7771a62ab1 [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 24c6eaea15 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674888

Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
 2021-04-14 05:46:16 +00:00
Bill Yi
24c6eaea15 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:51 +00:00
Lorenzo Colitti
cb6798a90a Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42 am: d76eb01fbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
 2021-04-14 03:00:32 +00:00
Bill Yi
51f05deb78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
 2021-04-13 19:36:45 -07:00
Lorenzo Colitti
d76eb01fbe Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: c6a866fb42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
 2021-04-14 02:33:11 +00:00
Bill Yi
49bae33c5e [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours am: 7d7b5bcb9f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14176451

Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e
 2021-04-14 01:30:08 +00:00
Lorenzo Colitti
c6a866fb42 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
 2021-04-14 01:24:19 +00:00
Bill Yi
7d7b5bcb9f [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours 
am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14176451

Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a
 2021-04-14 00:31:09 +00:00
Bill Yi
32cf6f6f6b Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE 
Merged-In: I9af489ae7bdd448c552c97d4478f1760a13fb970
Change-Id: I368382a9924b2d3dc697ae6450239f23d5cbf520
 2021-04-13 15:34:44 -07:00
Lorenzo Colitti
1479494fd5 Add @RedactionType annotations to VpnTransportInfo. 
This is in response to API council feedback.

Test: m
Bug: 185226718
Change-Id: I63d7249e7d14ac00558f311a3583f6adbf80e3d9
 2021-04-14 00:28:19 +09:00
Pedro Loureiro
8d6b5c8d6f Merge "Add lint baseline to address NewApi errors" into sc-dev 2021-04-13 14:12:41 +00:00
Chiachang Wang
93f6590e65 Merge "Extend framework-connectivity.impl visibility to more test" into sc-dev 2021-04-13 13:27:45 +00:00
Chiachang Wang
00cb5f4763 Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26 am: 7ebbfc98d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Ic0b7887630c00404ff354c193b82a96930940556
 2021-04-13 13:06:43 +00:00
Chiachang Wang
7ebbfc98d2 Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f am: 84c2646d26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
 2021-04-13 11:54:57 +00:00
Pedro Loureiro
2507c8b9c5 Add lint baseline to address NewApi errors 
We are enabling a new lint check where the min sdk != compile sdk.
It has produced a lot of errors and adding the baseline file(s)
allows us to continue work without introducing more problems.

Bug: 150847901

Test: m lint-check
Change-Id: Ide8a8fe80ba31396f23853ab266afcbcc33af9a6
 2021-04-13 10:51:51 +01:00
Chiachang Wang
84c2646d26 Merge "Make getUid a method on UserHandle itself instead of static" am: 4bc8b1386f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
 2021-04-13 08:51:12 +00:00
Chiachang Wang
4bc8b1386f Merge "Make getUid a method on UserHandle itself instead of static" 2021-04-13 08:15:47 +00:00
Chiachang Wang
fdf34500e2 Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3 am: 38b1591c16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I0cdc2e50246204925590ba556b6b67a7499140ee
 2021-04-13 06:59:05 +00:00
Chiachang Wang
38b1591c16 Merge "Add SDK version check to skip S added API test" am: 045961b828 am: 97247ff9a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6
 2021-04-13 06:02:20 +00:00
Chiachang Wang
97247ff9a3 Merge "Add SDK version check to skip S added API test" am: 045961b828 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
 2021-04-13 05:17:53 +00:00
Chiachang Wang
dc1bfe31c4 Extend framework-connectivity.impl visibility to more test 
Allow captive portal tests to use hidden connectivity methods.

Bug: 182859030
Test: m
Change-Id: I2c51cbefa6d56c7ec53bacfffe735fa9d14c6510
 2021-04-13 12:53:06 +08:00
Chiachang Wang
045961b828 Merge "Add SDK version check to skip S added API test" 2021-04-13 04:30:36 +00:00
Junyu Lai
314d51526b Merge "Fix nascent timer never get removed" into sc-dev 2021-04-13 03:34:49 +00:00
Chiachang Wang
d2bce7b6e3 Add SDK version check to skip S added API test 
NetworkAgentConfigTest is a part of CtsNetTestCasesLatestSdk.
It will be used in mainline test with a R build. Test will
fail with method not found error. Add a version check to skip
the S added API tests.

Test: atest NetworkAgentConfigTest in R and S device
Fix: 185151127
Change-Id: Ib372e68afa99af455eb2713c8f6f1c8ef1d4cfdf
 2021-04-13 10:18:36 +08:00
Paul Hu
0873486f3c Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev 2021-04-13 02:05:21 +00:00