Commit Graph

8947 Commits

Author SHA1 Message Date
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
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
13097923fa Merge changes I97015365,Ic9db4b9b into rvc-dev
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
2020-03-18 10:15:15 +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
junyulai
0dbffa4ad5 [SP25] Rename functions that add Entry conditionally am: 5d89df732b
Change-Id: I5f9924cf5b3eccfcdaa6dda991a102b97cebd11a
2020-03-17 23:35:57 +00:00
junyulai
69e146bbc5 [SP25] Rename functions that add Entry conditionally am: 5d89df732b
Change-Id: Ie34fa0421b619af8479ca254bc6a895792a993d0
2020-03-17 23:35:53 +00:00
junyulai
08da9375a6 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: I480e66ff5b65a1ba24ecffb288ba429c2f94219e
2020-03-17 23:35:52 +00:00
junyulai
bf8e5cf064 [SP24] Rename functions that add Entry unconditionally am: 9f288e6990
Change-Id: I983a448c1556b86fdf79c4989b2b0c579730837b
2020-03-17 23:35:50 +00:00
junyulai
180557c20a [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: I80ab45b6a34b66f1bed766b3e2fb72926325021e
2020-03-17 23:35:48 +00:00
junyulai
43ff860cf2 [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a
Change-Id: I77a249ad66acf360ec1b0acfe14f9db704040c11
2020-03-17 23:35:40 +00:00
Junyu Lai
3e09da5d5d Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev
* changes:
  [SP25] Rename functions that add Entry conditionally
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
  [SP21] Address comments for API council review about aosp/1172143
  [SP20] Check signature permission when accessing network stats provider
2020-03-17 23:11:34 +00:00
Automerger Merge Worker
809906ec3a [automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146 am: a076070c56 -s ours am: 35175b3239 -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 b5411218f8 is in history

Change-Id: I3cd0938b9367a5b1f382d30e0cd52aca61ed8827
2020-03-17 19:41:25 +00:00
Automerger Merge Worker
35175b3239 [automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146 am: a076070c56 -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 b5411218f8 is in history

Change-Id: I593e009d15d961fc44f5433cb8638aa7686d2b16
2020-03-17 19:28:24 +00:00
Automerger Merge Worker
a076070c56 Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146
Change-Id: I51d625ac3c086aceba9c06be7585e0e4f5022f1a
2020-03-17 19:13:39 +00:00
Cody Kesting
ff5be42146 Merge "Update ConnectivityDiagnosticsCallback function name." 2020-03-17 19:00:39 +00:00
Cody Kesting
e4d2df5726 Update ConnectivityDiagnosticsCallback function name.
API Council feedback suggests renaming ConnectivityDiagnosticsCallback
'onConnectivityReport' function to be 'onConnectivityReportAvailable'.

Bug: 150598997
Test: atest FrameworksNetTests
Change-Id: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
Merged-In: Ieea727ecee6cf358a53a215fd4b06233dfe967ea
2020-03-17 17:10:38 +00:00
Automerger Merge Worker
0970f1ef60 Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8 am: c2dcb2f8e5 am: 22e22c3b3e
Change-Id: I2684ca967356da99766738f323e90465b245858a
2020-03-17 16:11:53 +00:00
Automerger Merge Worker
b94cce7dd9 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours am: 1ae67980c2 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 539cd36a1d is in history

Change-Id: Idf2b13a076c0025d4a4dbf2d202ba953573d3651
2020-03-17 16:10:34 +00:00
Automerger Merge Worker
86f1d4eef7 [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 -s ours am: 27d2d10b8b -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 30762e1e07 is in history

Change-Id: Iab7f7292cb6e60f5646e47bbcf9656cd5c7cea86
2020-03-17 16:10:14 +00:00