LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,967 Commits 2 Branches 0 Tags
404eb55a33fdb769b80e4d7728320036770afd40
Commit Graph

10967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Huang
404eb55a33 [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 am: c078fae644 -s ours am: af780315ab -s ours am: e1b50696e0 -s ours am: beff4c52a9 -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 f0ada3725f is in history

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

Change-Id: I02a95fbeddc4dda3efa8ed93c3b92de28bb756f4
 2020-06-17 10:01:08 +00:00
Aaron Huang
beff4c52a9 [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 am: c078fae644 -s ours am: af780315ab -s ours am: e1b50696e0 -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 f0ada3725f is in history

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

Change-Id: I03cc7680a5a57f16862792351ddae20acd66167a
 2020-06-17 09:47:28 +00:00
Aaron Huang
e1b50696e0 [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 am: c078fae644 -s ours am: af780315ab -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 f0ada3725f is in history

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

Change-Id: I2058092be5426269fc93e209517a0d01c2fab1ec
 2020-06-17 09:34:01 +00:00
Aaron Huang
af780315ab [automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 am: c078fae644 -s ours 
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 f0ada3725f is in history

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

Change-Id: I11b25c0832d6959e77bbabbfce53cdedce922279
 2020-06-17 09:21:52 +00:00
Aaron Huang
c078fae644 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 4a4540dee6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476

Change-Id: I1b191cd4706a7409794d382bda95ef6933b019a1
 2020-06-17 09:09:13 +00:00
Aaron Huang
4a4540dee6 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" 2020-06-17 08:52:20 +00:00
Automerger Merge Worker
4e89a872ed Merge "Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace -s ours" into rvc-d1-dev-plus-aosp am: 0d7c5b2fa8 -s ours" into rvc-qpr-dev-plus-aosp am: 5819ddb927 -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 593f1e8176 is in history

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

Change-Id: Ibad172f0168ecd8ad0eba2d642efdedf57eef399
 2020-06-16 04:17:31 +00:00
Automerger Merge Worker
d91c79f791 Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace am: 702c4e7abb -s ours" into rvc-qpr-dev-plus-aosp am: 9200d04abb -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 593f1e8176 is in history

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

Change-Id: Id02abf28440776818dfec849b213d126e75ba527
 2020-06-16 04:17:03 +00:00
TreeHugger Robot
40f89028c7 [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 32a83a3ef7 -s ours am: 44f754326a -s ours am: 3788437a47 -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history

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

Change-Id: I1adb04c564663fbe4fb05af7411dd9289b1ff832
 2020-06-16 04:16:43 +00:00
Automerger Merge Worker
5819ddb927 Merge "Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace -s ours" into rvc-d1-dev-plus-aosp am: 0d7c5b2fa8 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-16 03:58:31 +00:00
Automerger Merge Worker
a92ef4ca08 Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace -s ours" into rvc-d1-dev-plus-aosp am: 0d7c5b2fa8 -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 593f1e8176 is in history

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

Change-Id: Ia59f937086c386b22c727aef90099af62229d012
 2020-06-16 03:58:24 +00:00
Automerger Merge Worker
9200d04abb Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace am: 702c4e7abb -s ours" into rvc-qpr-dev-plus-aosp 2020-06-16 03:58:23 +00:00
TreeHugger Robot
fede484676 [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace am: 702c4e7abb -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history

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

Change-Id: I5fdebc339ea29f89fc07eb5d7843db24f27d23cd
 2020-06-16 03:58:13 +00:00
TreeHugger Robot
3788437a47 [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 32a83a3ef7 -s ours am: 44f754326a -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history

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

Change-Id: I3e98eecb7de50eea0bb57bf62cb5201fac7c065d
 2020-06-16 03:58:10 +00:00
Automerger Merge Worker
0d7c5b2fa8 Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace -s ours" into rvc-d1-dev-plus-aosp 2020-06-16 03:42:40 +00:00
TreeHugger Robot
fd2a58b92f [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 00bec70ace -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history

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

Change-Id: I7a0a49a16ce67ddcf86ea6ad4d7ccda9f15181e9
 2020-06-16 03:42:23 +00:00
TreeHugger Robot
44f754326a [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: 32a83a3ef7 -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history

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

Change-Id: Iad71a237e3bac6340747e86a77c5569fea0bfb42
 2020-06-16 03:42:22 +00:00
TreeHugger Robot
00bec70ace Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409

Change-Id: Ie8f59a561f7184bcfbbe38e99da78ce092475ff8
 2020-06-16 03:28:44 +00:00
TreeHugger Robot
32a83a3ef7 [automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours 
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 0f6aeff137 is in history

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

Change-Id: I63ad698bb29d3770e879f27b155a9fc656a80836
 2020-06-16 03:28:39 +00:00
Chiachang Wang
593f1e8176 Test extra info sent to NetworkMonitor 
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.

Bug: 156173829
Test: atest FrameworkNetTests
Merged-In: I4f827664c528bea30cc957a0a617dd37693f4460
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
 2020-06-16 01:57:46 +00:00
Chiachang Wang
1565b969ce Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 am: 8825abb697 am: bd4096a4b6 am: 6189d49c67 am: 9a096560bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: Idef226312b728fb041d9f58e664d8a9a2cad7f9f
 2020-06-16 01:44:23 +00:00
Chiachang Wang
9a096560bb Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 am: 8825abb697 am: bd4096a4b6 am: 6189d49c67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I860a85ee44c7fb3d6707bdae637c52c6796324b1
 2020-06-16 01:29:27 +00:00
Chiachang Wang
6189d49c67 Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 am: 8825abb697 am: bd4096a4b6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: I52edaf94601620b8b22030e586ae9de0742b3303
 2020-06-16 01:16:41 +00:00
Chiachang Wang
bd4096a4b6 Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 am: 8825abb697 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: Ice048df853589411ee1f1c935b929994af1c525b
 2020-06-16 01:02:52 +00:00
Chiachang Wang
8825abb697 Merge "Test extra info sent to NetworkMonitor" am: cd192301a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060

Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff
 2020-06-16 00:52:01 +00:00
Chiachang Wang
cd192301a2 Merge "Test extra info sent to NetworkMonitor" 2020-06-16 00:38:58 +00:00
Benedict Wong
5da3e20cfb Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 am: bc6da9922c am: e980440591 am: 26d802f1ec am: 6c003e8896 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: Ib473ec592210bc7f7f8ee86ef0f9b10e7f45e0a4
 2020-06-15 17:54:29 +00:00
Benedict Wong
6c003e8896 Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 am: bc6da9922c am: e980440591 am: 26d802f1ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: I5b6b70ae00de8752b1033fc35bacc91549fe5dea
 2020-06-15 17:44:11 +00:00
Benedict Wong
26d802f1ec Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 am: bc6da9922c am: e980440591 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: Id56df437468962eea48b453c99564f68e3b38756
 2020-06-15 17:38:17 +00:00
Benedict Wong
e980440591 Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 am: bc6da9922c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: I5ff673d97fe4558da77575b2cc8c43b87e3673f6
 2020-06-15 17:33:33 +00:00
Benedict Wong
bc6da9922c Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493

Change-Id: I04609b41c9e878e1e3ca8f128d86290012d4ede7
 2020-06-15 17:18:15 +00:00
Benedict Wong
08447ffcc0 Merge "Set correct owner UID for VPN agentConnect()" 2020-06-15 17:09:46 +00:00
Aaron Huang
791dfcb0f5 Add unit test for NetworkStatsSubscriptionsMonitor 
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
(copy from ag/11788484 but getActiveAndHiddenSubscriptionIdList() since it's renamed
in internal)
Change-Id: Ia162f36efe96d90b2f6f70190d9fa855bba34484
Merged-In: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
 2020-06-15 07:05:19 +00:00
Chiachang Wang
0f6aeff137 Test extra info sent to NetworkMonitor 
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.

Bug: 156173829
Test: atest FrameworkNetTests
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
 2020-06-12 18:13:00 +08:00
Chalard Jean
e40fdf51ea [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b am: 3f287e6c62 -s ours am: c8a21e00ee -s ours am: 6ecefb57e7 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 f980a6cabb is in history

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

Change-Id: I2368ddb41534da8a33f4b0152852c66673f1b7a1
 2020-06-12 05:50:41 +00:00
Chalard Jean
c5908ed1d8 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b -s ours am: 06050597d5 -s ours am: f7f399cea5 -s ours am: bf7fd2260c -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 f980a6cabb is in history

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

Change-Id: Ic2a2972a84fe25f24418b92ba5a06c783504468f
 2020-06-12 05:50:11 +00:00
Chalard Jean
de53ff93e1 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b am: 3f287e6c62 am: ed78b8532d -s ours am: ad5b1b76a5 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 7f06b34acd is in history

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

Change-Id: I945126af614e70322d878d258eba819f5b6cd4e9
 2020-06-12 05:49:03 +00:00
Chalard Jean
6ecefb57e7 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b am: 3f287e6c62 -s ours am: c8a21e00ee -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 f980a6cabb is in history

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

Change-Id: I3df529b7edc3a09065962a81fe12cbff11f7a980
 2020-06-12 05:27:24 +00:00
Chalard Jean
bf7fd2260c [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b -s ours am: 06050597d5 -s ours am: f7f399cea5 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 f980a6cabb is in history

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

Change-Id: I0d48248896a5877afa23566ff28bba39cee8b473
 2020-06-12 05:26:56 +00:00
Chalard Jean
ad5b1b76a5 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b am: 3f287e6c62 am: ed78b8532d -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 7f06b34acd is in history

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

Change-Id: Ia5760dd31d1c8b9c1e3ee4b367c51c0521c33e63
 2020-06-12 05:25:51 +00:00
Chalard Jean
c8a21e00ee [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b am: 3f287e6c62 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 f980a6cabb is in history

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

Change-Id: I7194a4a3a70f93dd510bda107f620e23fb0af19d
 2020-06-12 05:12:16 +00:00
Chalard Jean
f7f399cea5 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b -s ours am: 06050597d5 -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 7f06b34acd is in history

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

Change-Id: I51aaef47a6e94d53a744b80fc684cd6fda6ec73c
 2020-06-12 05:11:29 +00:00
Chalard Jean
06050597d5 [automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b -s ours 
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 7f06b34acd is in history

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

Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
 2020-06-12 04:58:29 +00:00
Chalard Jean
3f287e6c62 Merge "Document the limitation to a hundred callbacks." into rvc-dev am: bcc8427b3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429

Change-Id: Ic82a23e6f949bd2c74c3dc49da516938f0603e2e
 2020-06-12 04:58:27 +00:00
Chalard Jean
bcc8427b3b Merge "Document the limitation to a hundred callbacks." into rvc-dev 2020-06-12 04:54:02 +00:00
Automerger Merge Worker
8c48e6d686 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: 7150252ba4" into rvc-d1-dev-plus-aosp am: fdb090db84 am: 5161e046e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I7b147a4e1de889c391271589dcdb2a8226beca42
 2020-06-12 02:36:05 +00:00
Automerger Merge Worker
b6b97fd181 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: a0e48b1df5 am: 15a62ea56f" into rvc-qpr-dev-plus-aosp am: 29f55694be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I9ce16e7c5150e481af894be0b8c5524f976e6390
 2020-06-12 02:35:54 +00:00
Aaron Huang
2b4aa6a273 Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: a0e48b1df5 am: 2acbd72f5e am: 5e48bf1a25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I8a039b0c164e51ed9054d229f52ece259b894b63
 2020-06-12 02:35:26 +00:00
Automerger Merge Worker
5161e046e3 Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: 7150252ba4" into rvc-d1-dev-plus-aosp am: fdb090db84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I65a8db74593d794c6efba6b70ae5e575cfce25d1
 2020-06-12 02:32:20 +00:00
Automerger Merge Worker
29f55694be Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 4ca7d588b4 am: a0e48b1df5 am: 15a62ea56f" into rvc-qpr-dev-plus-aosp 2020-06-12 02:31:40 +00:00