Commit Graph

9022 Commits

Author SHA1 Message Date
Lucas Lin
5417bfda8b Merge "Add version check to prevent test fail on Android Q" am: 96da9cf154 am: ed930bec98 am: ad691b3e04 am: f72c60dd64 am: 21406119f2
Change-Id: I8356aed1bdf2646671d045e10c9d0c8115c10ca5
2020-03-18 04:50:58 +00:00
Junyu Lai
d6a52674f9 [automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 6fa3bc3460 am: c3fb848e35 -s ours am: 1805ffac82 -s ours am: 90ae643a66 -s ours am: 5b83556173 -s ours
am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 5d89df732b is in history

Change-Id: I0a3f09c46eef66ec405a98c213ed1fa64638dd4c
2020-03-18 04:49:05 +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
Junyu Lai
66bab7dd7e Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 53bdd05439 am: 9cfbea2907 am: 0dc138bdb2
Change-Id: Iecf1a331ab6d9d169dbf7e17ed25550d0aaedc63
2020-03-18 00:44:14 +00:00
junyulai
58b4c2090f [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 69e146bbc5 am: e7b24a29b1 am: b1dba8403b
Change-Id: I521740ccd3ab7e2bd9c4eced948b4d50ce5de47d
2020-03-18 00:39:35 +00:00
junyulai
727d3d99d3 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 am: bf8e5cf064 -s ours am: d766a38e36 -s ours am: 08f592e30b -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 9f288e6990 is in history

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

Change-Id: I9e09cf7be805757e5e76fddb7831c6f09d0c6bf7
2020-03-18 00:39:28 +00:00
Junyu Lai
d92c230dc7 Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev am: 3e09da5d5d am: 3e5cf4797b am: 35ed012437 am: 8033ab1788
Change-Id: I54bfdf98273ed4c78f035124edb2fb5a6aa9a7f2
2020-03-18 00:37:18 +00:00
junyulai
0a37411c82 [SP25] Rename functions that add Entry conditionally am: 5d89df732b am: 0dbffa4ad5 am: 451c47629e am: c3d7524be0
Change-Id: Ia0473dc09f439216321e4571aa0b1e6c01e68173
2020-03-18 00:33:47 +00:00
junyulai
b3655ae519 [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 9f288e6990 -s ours am: 08da9375a6 -s ours am: 6a7726457c -s ours am: 62feb0da00 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 2521ad7386 is in history

Change-Id: I3e643366f1932d99e068e7afbab29f6281bf1796
2020-03-18 00:33:44 +00:00
junyulai
127bfee382 [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours am: 76a9658f9e -s ours am: 809ac22e18 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history

Change-Id: Id1ee0b834ff1f6ec0e79316657e8a87e393605c1
2020-03-18 00:33:38 +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
4190f34cec [automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: ff5be42146 am: a076070c56 -s ours am: 35175b3239 -s ours am: 809906ec3a -s ours am: a8ea58635e -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 b5411218f8 is in history

Change-Id: If5aeb21a71e9e955a75dd2da8cb7b41dc4033403
2020-03-17 20:25:40 +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
Automerger Merge Worker
940514efb8 Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8 am: c2dcb2f8e5 am: 22e22c3b3e am: 0970f1ef60 am: ae376b4282
Change-Id: I32f4768c6d534235f06f88c17f65bbb51ad42924
2020-03-17 17:12:34 +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
4abb0a22e3 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours am: 1ae67980c2 -s ours am: b94cce7dd9 -s ours am: 2a76ccb0ea -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 539cd36a1d is in history

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

Change-Id: Iad090df35de2523880f2b5c63be591861555d727
2020-03-17 17:08:59 +00:00
Automerger Merge Worker
f26ffda5ec [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f am: cbc2ca4681 -s ours am: 98604b57c9 -s ours am: dec7470980 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3 is in history

Change-Id: Ib38f02ecff80d6e353617e15220c7b33220a218f
2020-03-17 17:08:18 +00:00
Automerger Merge Worker
bf83d523d8 [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 am: 579c2bd4af -s ours am: 56848eadfe -s ours am: 253da1cd26 -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df is in history

Change-Id: I3e9be1398f27db10d18820cd9e374105c4726e79
2020-03-17 17:08:03 +00:00
Automerger Merge Worker
d20a3f1a5e Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: 5bc1ba2198 am: e95e9bdfc4 am: 890d7de258
Change-Id: I2544415c46b659798e74b0f5fa476407fcd59313
2020-03-17 17:07:48 +00:00
Automerger Merge Worker
780aa9ae2d Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: ba4aecf53c am: 0d6fdd3098 am: 33a0734fe7
Change-Id: Ie7374784ccf523e6dcf28f207e9639405e82c220
2020-03-17 17:07:19 +00:00
Automerger Merge Worker
d7b1ed63fc [automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566 am: 86ba38a5ba -s ours am: 8df9d88504 -s ours am: 4ac7ae7348 -s ours am: b063f2422b -s ours
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d is in history

Change-Id: I878489901b16336316dfb53c3475b4912887d8c9
2020-03-17 16:53:28 +00:00