LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,850 Commits 2 Branches 0 Tags
9b4514026d0fae40d4a04ec7d1bb8564aaff3473
Commit Graph

8850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
9b4514026d Merge "[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff -s ours am: a4b26a1dcd -s ours am: e1dc4eceb0 -s ours" into rvc-qpr-dev-plus-aosp am: 62cad0ee8c -s ours 
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 46b1d18fc5 is in history

Change-Id: I6ffeefd7f1b28f25285e3750c3eb18c7e2642dfd
 2020-03-16 10:14:45 +00:00
Automerger Merge Worker
6a89b3b3c7 Merge "[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff am: 94a4abe30b -s ours am: d969083ace -s ours" into rvc-qpr-dev-plus-aosp am: b3df3194c5 -s ours 
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 aae21605af is in history

Change-Id: Ia621b593fceb9eae21e69ea633e1e6a90b3d0e03
 2020-03-16 10:14:25 +00:00
Automerger Merge Worker
e1dc4eceb0 [automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff -s ours am: a4b26a1dcd -s ours 
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 46b1d18fc5 is in history

Change-Id: Id9777ff826cedcbb3affb07a8c3f21a6af6a4ade
 2020-03-16 10:05:44 +00:00
Automerger Merge Worker
d969083ace [automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff am: 94a4abe30b -s ours 
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 aae21605af is in history

Change-Id: I3a6d982e29700b478ae507083a40e08a42f26f22
 2020-03-16 10:05:31 +00:00
Automerger Merge Worker
a4b26a1dcd [automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff -s ours 
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 aae21605af is in history

Change-Id: I90422f29362f90c43c4f32857b0f8a09f932731d
 2020-03-16 10:00:42 +00:00
Automerger Merge Worker
94a4abe30b Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfeff 
Change-Id: I2416902c665063f6ce6d59c5105d974f4075876d
 2020-03-16 10:00:31 +00:00
Automerger Merge Worker
46b1d18fc5 Add test for getDeprecationTime and getExpirationTime 
Add for cts coverage for system API

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
Change-Id: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
Merged-In: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
(cherry picked from commit 1e7f68f39c0855a45dbf4eeecbff430a2f6f3396)
 2020-03-16 08:04:19 +00:00
Automerger Merge Worker
2dd2cba647 [automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 am: d11c52b585 -s ours am: 66aad33efd -s ours am: af64092b38 -s ours 
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 ef12b64147 is in history

Change-Id: I0d0580aee144a109550dd0e51d43c7f911a2549c
 2020-03-16 06:24:42 +00:00
Automerger Merge Worker
0345b1f0c6 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: b464fd2143 am: 8484d92f7d am: 50f5f74915 
Change-Id: I5a3937a5e6896b8df044e6478b601e5d8bf9b072
 2020-03-16 06:24:32 +00:00
Automerger Merge Worker
4f551fab13 [automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours am: 1db8a8251f -s ours am: 12a828d5f3 -s ours am: bca7ed084b -s ours 
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history

Change-Id: I975c9cba49241ce0f39f000326541a275a42bd7c
 2020-03-16 06:23:47 +00:00
Automerger Merge Worker
05e8cc8c00 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: 86fbb8231c am: 57b9e58b89 am: 9ea02f1285 
Change-Id: I18162455a05188e53b738f32a667ff88bd269858
 2020-03-16 06:23:32 +00:00
Automerger Merge Worker
66aad33efd [automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 am: d11c52b585 -s ours 
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 ef12b64147 is in history

Change-Id: I11cca0bed3a3424b92ff7ed155ca729cef37135e
 2020-03-16 06:08:15 +00:00
Automerger Merge Worker
8484d92f7d Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: b464fd2143 
Change-Id: I028e1c3f4d0ea78669f2b8a4188a0d4064dfa007
 2020-03-16 06:08:04 +00:00
Automerger Merge Worker
12a828d5f3 [automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours am: 1db8a8251f -s ours 
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history

Change-Id: I96b83022f7ef1e9e4f12fdd806d62da5e1f08738
 2020-03-16 06:03:38 +00:00
Automerger Merge Worker
57b9e58b89 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: 86fbb8231c 
Change-Id: I2812019cd89e700adeb3a5e79bf18d8d9985026b
 2020-03-16 06:03:30 +00:00
Automerger Merge Worker
d11c52b585 Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 
Change-Id: Ic5103cf650dc16a2d6dd7ace1f25386175a27b0c
 2020-03-16 05:54:09 +00:00
Automerger Merge Worker
b464fd2143 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 
Change-Id: I1c34bf3459158578949ad665fcce3cff7d15e353
 2020-03-16 05:53:53 +00:00
Automerger Merge Worker
1db8a8251f [automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours 
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history

Change-Id: I0a46cc19cb5cfb0a90a96299f48195ab2e2c836f
 2020-03-16 05:53:38 +00:00
Automerger Merge Worker
86fbb8231c Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 
Change-Id: I72f00d09e74eb0de1d837a29a2b869a4de45178d
 2020-03-16 05:53:15 +00:00
Paul Hu
46a3b708b2 Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev 2020-03-16 05:48:33 +00:00
Aaron Huang
eb93e7de21 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev 2020-03-16 05:47:34 +00:00
Automerger Merge Worker
a8de50a925 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180 am: 77f57ba2c0 am: f408ea33ff am: ea2436cef3 
Change-Id: Ibbd07a7c7f683c7148a51d06cf3640bef5ccad02
 2020-03-16 04:08:13 +00:00
Automerger Merge Worker
8c5796fc9d [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e am: ceb5fe6225 am: 15ac97e669 am: d6a9330e27 
Change-Id: I03934f2175f8ac1f54a6c150fe6d781d5d2ba870
 2020-03-16 04:06:01 +00:00
Automerger Merge Worker
f408ea33ff Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180 am: 77f57ba2c0 
Change-Id: I5c77bcd0a95e51c91c306981c5f396f445da5ab8
 2020-03-16 03:39:33 +00:00
Automerger Merge Worker
15ac97e669 [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e am: ceb5fe6225 
Change-Id: I9c44371665dc09612357a5ef880364bc32824784
 2020-03-16 03:39:03 +00:00
Automerger Merge Worker
77f57ba2c0 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180 
Change-Id: Ic4d1d7f7ce4bf8c6bf03fbe1da57216a8179bca9
 2020-03-16 03:14:45 +00:00
Automerger Merge Worker
ceb5fe6225 [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e 
Change-Id: I86cf3b57722f64c0989ce606fde71d6173f812bb
 2020-03-16 03:14:01 +00:00
Automerger Merge Worker
36b22b0180 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 
Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7
 2020-03-16 03:05:06 +00:00
Automerger Merge Worker
893301ab1e [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
 2020-03-16 03:03:51 +00:00
Automerger Merge Worker
7207687af8 Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 522734b78b am: 1635cbf50d am: 5b4244bd03 
Change-Id: Idbd10d7fb0f5a1c676e0d13128beea06fc5ac0c2
 2020-03-16 03:02:21 +00:00
Automerger Merge Worker
b361258fb8 Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 9889ee4fe1 am: 4df691d2f7 am: c40efac143 
Change-Id: I23ba37e99a61e327ece8f56e7af6db8dce66ecc8
 2020-03-16 03:01:52 +00:00
Junyu Lai
cc8e8480b3 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
Automerger Merge Worker
1635cbf50d Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 522734b78b 
Change-Id: I0893adb924499a1efcf544d7bd1a2ffe2c9087fe
 2020-03-16 02:29:20 +00:00
Automerger Merge Worker
4df691d2f7 Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 9889ee4fe1 
Change-Id: Ibfac233f986c6bc249f604a3f90a48e889da2a36
 2020-03-16 02:28:53 +00:00
Automerger Merge Worker
522734b78b Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf 
Change-Id: I6aa3f7f9c0dfc63ebd7ffb3b38662af29d8f59cb
 2020-03-16 02:15:17 +00:00
Automerger Merge Worker
9889ee4fe1 Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf 
Change-Id: I42d8dcfd819d21e87679746f50303adf378298cc
 2020-03-16 02:14:58 +00:00
Automerger Merge Worker
de065b5eb8 Resolve ambiguous argument. 
CTS tests don't have access to TestNetworkAgent and therefore
require overloading this method, which means 'null' is ambiguous.

Bug: 139268426
Test: FrameworksNetTests
Change-Id: I5d7deea82d7114fa38f37b90f94fe7e6073bd848
(cherry picked from commit ff83f1d7eea38c4143869cbf10dca5972421f6cd)
 2020-03-15 12:56:05 +00:00
Automerger Merge Worker
9f4ff6b31d [automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 -s ours am: b02c1d1ee2 -s ours am: aa0debb1b5 -s ours am: aadd9773e3 -s ours 
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history

Change-Id: Idc79bd509ccf46ceee665e24eccbe72c53b9d490
 2020-03-15 03:46:48 +00:00
Automerger Merge Worker
363169c97f [automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 am: b1b6a59bce -s ours am: be9795f9ce -s ours am: 0e2d0f32e6 -s ours 
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history

Change-Id: I79c8eb355247059fae85a4010e41233ad92f03ee
 2020-03-15 03:46:28 +00:00
Automerger Merge Worker
aa0debb1b5 [automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 -s ours am: b02c1d1ee2 -s ours 
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history

Change-Id: Ia6bfdffbc44c1804e52094a07f4beda0d17aab62
 2020-03-15 03:19:11 +00:00
Automerger Merge Worker
be9795f9ce [automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 am: b1b6a59bce -s ours 
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history

Change-Id: Ie13b56b44a5d959dbfb4f3231b20332fbf5c3da7
 2020-03-15 03:18:52 +00:00
Automerger Merge Worker
b1b6a59bce Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 
Change-Id: I1095996e36241eb0a42598aa737322610767599f
 2020-03-15 03:04:40 +00:00
Automerger Merge Worker
b02c1d1ee2 [automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 -s ours 
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history

Change-Id: Ie69348158857b989b25c3f7531de4d26f2b7965e
 2020-03-15 03:04:27 +00:00
Mark Chien
239acdbbb1 Merge "Add javadoc for Network#netId" into rvc-dev 2020-03-15 02:53:29 +00:00
Automerger Merge Worker
9010115d81 Merge "Resolve ambiguous argument." am: 947aa6c65d am: 4d7a85bd6f am: a3ad53a2ab am: f6fece2d31 am: c657bdf26e 
Change-Id: I5d7deea82d7114fa38f37b90f94fe7e6073bd848
 2020-03-14 05:13:42 +00:00
Automerger Merge Worker
f6fece2d31 Merge "Resolve ambiguous argument." am: 947aa6c65d am: 4d7a85bd6f am: a3ad53a2ab 
Change-Id: I1825a198c1643c70de97c6f078cf5a8ed05df7f8
 2020-03-14 04:33:47 +00:00
Automerger Merge Worker
a3ad53a2ab Merge "Resolve ambiguous argument." am: 947aa6c65d am: 4d7a85bd6f 
Change-Id: Ie82a2f802331a9a42a4280fbbc91136fda284444
 2020-03-14 04:13:58 +00:00
Automerger Merge Worker
4d7a85bd6f Merge "Resolve ambiguous argument." am: 947aa6c65d 
Change-Id: I4c03bb6d16127929f4d60aa071aee18e8ac4c669
 2020-03-14 03:52:51 +00:00
Chalard Jean
947aa6c65d Merge "Resolve ambiguous argument." 2020-03-14 03:38:01 +00:00
Automerger Merge Worker
15722aa408 Merge changes from topic "services.net-wifi" into rvc-dev am: 79a252687d am: 239cd04817 am: 683e1c00f1 am: daddabcc2e 
Change-Id: I7111427474709dd8c25f745876443eee49882ec5
 2020-03-13 23:43:13 +00:00