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

8962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Kesting
ee5d79c06d Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f am: 75ee711747 
Change-Id: I66ff4f2cc559c52e2265c8cecbbd6b9b9d3c1164
 2020-03-18 20:06:15 +00:00
Cody Kesting
9ac1fc8dc1 Change NetworkCapabilities administrator UIDs to be stored as int[]. am: 1043927267 am: a5195fd1cb 
Change-Id: Ide9d239f813e8bff804d5e1a03f5dedee8e8edc1
 2020-03-18 20:05:43 +00:00
Cody Kesting
75ee711747 Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev am: cb9847691f 
Change-Id: I7bb08844a95fcae66f84a2756b6a06184c74733e
 2020-03-18 19:57:19 +00:00
Cody Kesting
a5195fd1cb Change NetworkCapabilities administrator UIDs to be stored as int[]. am: 1043927267 
Change-Id: I26343fa85d936aa71dbe983341343fd1d74a7a0a
 2020-03-18 19:56:33 +00:00
Cody Kesting
cb9847691f Merge "Change NetworkCapabilities administrator UIDs to be stored as int[]." into rvc-dev 2020-03-18 19:40:39 +00:00
Cody Kesting
1043927267 Change NetworkCapabilities administrator UIDs to be stored as int[]. 
NetworkCapabilities#mAdministratorUids is used to track the UIDs that
are administrators of the given Network. This value was previously
stored as List<Integer>. However, general Android API Council guidelines
recommend using Arrays for primitive values. In order to be consistent
with the guidelines, updating the field to use an Array.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: I2652a5b0f276b8944454af5cb4b1383a3e054cfa
 2020-03-18 17:40:24 +00:00
Automerger Merge Worker
a1851ed538 Merge "[automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 -s ours" into rvc-dev-plus-aosp am: cac4f8871a -s ours 
am skip reason: Change-Id I1ee7a26186885d3a79a32ec9e45f5bcd656a6680 with SHA-1 6d4e01e422 is in history

Change-Id: Iee0852500679aff2fca108713cca2109caa7d677
 2020-03-18 12:37:09 +00:00
TreeHugger Robot
b0e5017016 [automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 am: cbd17dab27 -s ours 
am skip reason: Change-Id Iece9e8ad5c51170cd404ac995d0005392d37fe0c with SHA-1 7bd2a24dab is in history

Change-Id: I48199e3bc051ba4d5e0c0a9309f8772c76935218
 2020-03-18 12:36:24 +00:00
TreeHugger Robot
cbd17dab27 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 
Change-Id: I8b43f896064dddb84986b5a8d6edad1116028a5b
 2020-03-18 12:08:46 +00:00
TreeHugger Robot
bd17a96675 [automerger skipped] Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev am: 1d204ac218 -s ours 
am skip reason: Change-Id Iece9e8ad5c51170cd404ac995d0005392d37fe0c with SHA-1 7bd2a24dab is in history

Change-Id: I9e4295ca98aa16dbee863c6a1f7475c59785db18
 2020-03-18 12:08:31 +00:00
TreeHugger Robot
1d204ac218 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" into rvc-dev 2020-03-18 11:49:09 +00:00
Automerger Merge Worker
050604626b Merge changes from topic "am-11d75c56d938476ab6f718fc0579e0a9" into rvc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa am: ac1cb7ea7d -s ours
  [automerger skipped] Add KeepalivePacketDataTest am: 62de8657e2 am: 50a55f9440 -s ours
 2020-03-18 10:47:30 +00:00
Chiachang Wang
db2b02f0cf [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa am: ac1cb7ea7d -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: I07fe90085cb201a3280241773282e14be9ce904a
 2020-03-18 10:47:25 +00:00
Chiachang Wang
79fe9214a4 [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa -s ours am: 6ba6520fd3 -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: I2c35e18c06e3d26d35a76ec3041a674148c8efc7
 2020-03-18 10:47:21 +00:00
Chiachang Wang
73c3812176 [automerger skipped] Add KeepalivePacketDataTest am: 62de8657e2 am: 50a55f9440 -s ours 
am skip reason: Change-Id Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8 with SHA-1 13c97ebd73 is in history

Change-Id: I5c099a4d59f8bb081be89496556c767d0cf414db
 2020-03-18 10:47:20 +00:00
Chiachang Wang
ac1cb7ea7d Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa 
Change-Id: Iadb42d352270a053e3fb5682c65ec9feb3d1b4b0
 2020-03-18 10:31:22 +00:00
Chiachang Wang
50a55f9440 Add KeepalivePacketDataTest am: 62de8657e2 
Change-Id: I1bff4ae03f4b56376d28514dc232b528dca99603
 2020-03-18 10:31:18 +00:00
Chiachang Wang
6ba6520fd3 [automerger skipped] Merge changes I97015365,Ic9db4b9b into rvc-dev am: 13097923fa -s ours 
am skip reason: Change-Id I97015365604be1846e3ecbaf60ac99e334705565 with SHA-1 fd007f01ef is in history

Change-Id: I4902fda4482ecad8ae6c38b32da0f40262cb316a
 2020-03-18 10:30:21 +00:00
Chiachang Wang
13097923fa Merge changes I97015365,Ic9db4b9b into rvc-dev 
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
 2020-03-18 10:15:15 +00:00
Junyu Lai
6d4e01e422 Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister 
Test: atest ConnectivityServiceTest#testNetworkFactoryUnregister \
      --geneate-new-metrics 100
Bug: 151792032

Change-Id: I1ee7a26186885d3a79a32ec9e45f5bcd656a6680
Merged-In: I1ee7a26186885d3a79a32ec9e45f5bcd656a6680
Merged-In: Iece9e8ad5c51170cd404ac995d0005392d37fe0c
(cherry picked from commit 31c26cdbeb35a6fd6a53a1c25cce6d36b825bf41)
 2020-03-18 10:09:44 +00:00
Junyu Lai
69a6311c32 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 am: ef43214f03 am: 0851670d30 
Change-Id: I5c68b88d7e39be0c04fc08d4e4f7d2b61231f0fb
 2020-03-18 09:23:21 +00:00
Junyu Lai
0851670d30 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 am: ef43214f03 
Change-Id: I941bdbd6877dbf5e269ee4e49fd3947681025961
 2020-03-18 09:02:12 +00:00
Junyu Lai
ef43214f03 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" am: e9e871ef83 
Change-Id: I93da1059a21adcf14f8c036c17963a07b1db964d
 2020-03-18 08:55:01 +00:00
Junyu Lai
e9e871ef83 Merge "Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister" 2020-03-18 08:41:08 +00:00
Lorenzo Colitti
8e9d7e2b40 Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 am: aa3afd9d64 am: b7dbb0b230 
Change-Id: I2c7695a5835d7ca05936d1f18c9cdd2003ecf925
 2020-03-18 08:06:02 +00:00
Lorenzo Colitti
b7dbb0b230 Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 am: aa3afd9d64 
Change-Id: I2164808ef628eb7c12e875f0bde7f5151bf6a5b5
 2020-03-18 07:52:25 +00:00
Lorenzo Colitti
aa3afd9d64 Merge "mtu: Add MTU parameter to Routes" am: b76fc089d7 
Change-Id: I3c730b35133c62db6723a58835e7f9d3874c124b
 2020-03-18 07:34:11 +00:00
junyulai
7bd2a24dab Fix flaky ConnectivityServiceTest#testNetworkFactoryUnregister 
Test: atest ConnectivityServiceTest#testNetworkFactoryUnregister \
      --geneate-new-metrics 100
Bug: 151792032
Change-Id: Iece9e8ad5c51170cd404ac995d0005392d37fe0c
 2020-03-18 15:22:54 +08:00
Lorenzo Colitti
b76fc089d7 Merge "mtu: Add MTU parameter to Routes" 2020-03-18 07:20:01 +00:00
Chiachang Wang
30a0107d13 Add NattKeepalivePacketDataTest 
Add test for constructor and parcel

Test: atest CtsNetTestCasesLatestSdk:android.net.NattKeepalivePacketDataTest
      on both Q and R devices
Bug: 151402211
Change-Id: I97015365604be1846e3ecbaf60ac99e334705565
Merged-In: I97015365604be1846e3ecbaf60ac99e334705565
 2020-03-18 05:44:26 +00:00
Chiachang Wang
62de8657e2 Add KeepalivePacketDataTest 
Add test for constructor of KeepalivePacketData and
InvalidPacketException

Bug: 151109466
Test: atest CtsNetTestCasesLatestSdk:android.net.KeepalivePacketDataTest
      on both Q and R devices
Change-Id: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
Merged-In: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8
 2020-03-18 05:43:42 +00:00
Lucas Lin
f72c60dd64 Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 am: ed930bec98 am: ad691b3e04 
Change-Id: I11fea0bb6c92c617592c9341bf8eb98694a6aba9
 2020-03-18 04:36:10 +00:00
Lucas Lin
ad691b3e04 Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 am: ed930bec98 
Change-Id: I1985c4cfe6ff1712f2d181a151bfee0160fc96bf
 2020-03-18 04:23:00 +00:00
Junyu Lai
90ae643a66 [automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 am: c3fb848e35 -s ours am: 1805ffac82 -s ours 
am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 5d89df732b is in history

Change-Id: I214ca8cb07535dbe33be18aa9a49d31811451ff5
 2020-03-18 04:16:40 +00:00
Lucas Lin
ed930bec98 Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 
Change-Id: I61546d3dc488326a32386a7d6f4c87d857b29fbd
 2020-03-18 04:10:21 +00:00
Junyu Lai
1805ffac82 [automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 am: c3fb848e35 -s ours 
am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 5d89df732b is in history

Change-Id: I19399123661123386472ff3f39d268d85917cbe1
 2020-03-18 04:02:05 +00:00
Lucas Lin
96da9cf154 Merge "Add version check to prevent test fail on Android Q" 2020-03-18 03:56:37 +00:00
Junyu Lai
c3fb848e35 Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 
Change-Id: I7e0698f0e60d4c26864ceb728b74a265351a8506
 2020-03-18 03:45:41 +00:00
Junyu Lai
6fa3bc3460 Merge "[SP25] Rename functions that add Entry conditionally" 2020-03-18 03:16:41 +00:00
junyulai
175c770f1c [SP25] Rename functions that add Entry conditionally 
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record conditionally,
name them addEntry.
  addValues -> addEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Fix: 148895143
Change-Id: I9495a198cf247e6c79100f7ac1edcea370b071de
Merged-In: I9495a198cf247e6c79100f7ac1edcea370b071de
(cherry picked from ag/10700816)
 2020-03-18 00:29:15 +00:00
Junyu Lai
9cfbea2907 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 53bdd05439 
Change-Id: I02c933a53bc48b66fbcfa4443add7f985d18d7d2
 2020-03-18 00:04:36 +00:00
junyulai
e7b24a29b1 [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 69e146bbc5 
Change-Id: If680ce98285993eea602ee346e2ff7ce7263e0c1
 2020-03-18 00:02:55 +00:00
junyulai
d766a38e36 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 am: bf8e5cf064 -s ours 
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 9f288e6990 is in history

Change-Id: I55e9099497ae6b5248b3391d438b2ab78857a657
 2020-03-18 00:02:54 +00:00
junyulai
5f7339c644 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a am: 43ff860cf2 -s ours 
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 2cb4c9359a is in history

Change-Id: I778c34aed7223a82d8c0238aaf7995bd4171a2c2
 2020-03-18 00:02:50 +00:00
Junyu Lai
35ed012437 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 3e5cf4797b 
Change-Id: Ic1397a8b02104b52d595621e1eae9cd8ac131071
 2020-03-18 00:00:42 +00:00
junyulai
451c47629e [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 0dbffa4ad5 
Change-Id: I22d32f9cbc9c2694160ad5cd30d7b637529b8e44
 2020-03-17 23:56:28 +00:00
junyulai
6a7726457c [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours am: 08da9375a6 -s ours 
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: Ib807d1cf6bf4c2a9be054bf5df7377f540201c63
 2020-03-17 23:56:26 +00:00
junyulai
76a9658f9e [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours 
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: I47afb9f93dc191b4e04e4d5bd5ff4a1cfd566b02
 2020-03-17 23:56:20 +00:00
Junyu Lai
53bdd05439 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d 
Change-Id: I8b2ee860681bc161e0256ad4273cefbe316df4d1
 2020-03-17 23:37:11 +00:00
Junyu Lai
3e5cf4797b Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d 
Change-Id: If92a47eab97936b6228d32388834d8ca81279d0d
 2020-03-17 23:37:07 +00:00