Commit Graph

8914 Commits

Author SHA1 Message Date
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
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
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
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
Automerger Merge Worker
98604b57c9 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f am: cbc2ca4681 -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3 is in history

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

Change-Id: Ic965376fbf895252141d4d3ed9c3898d6e1bd8a9
2020-03-17 16:04:32 +00:00
Automerger Merge Worker
e95e9bdfc4 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: 5bc1ba2198
Change-Id: Ia7a1ebbada866e5f6745ac2e19442f5138809f16
2020-03-17 16:04:13 +00:00
Automerger Merge Worker
0d6fdd3098 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311 am: ba4aecf53c
Change-Id: I499ae9ec841be5be465cc8341f4385d857cc0168
2020-03-17 16:04:04 +00:00
Automerger Merge Worker
22e22c3b3e Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8 am: c2dcb2f8e5
Change-Id: I4fb9efa69133ce8f960a37cfbb73264a4bfbf97a
2020-03-17 15:54:48 +00:00
Automerger Merge Worker
cbc2ca4681 Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f
Change-Id: Id6e807272dca79a2e02974a7e6985eb6e7515326
2020-03-17 15:49:07 +00:00
Automerger Merge Worker
1ae67980c2 [automerger skipped] Merge "Add support for registering test networks with administrators." into rvc-dev am: d95e6de42f -s ours
am skip reason: Change-Id I7a443c368cf1ac470fbe40883ca24bc3143153b0 with SHA-1 c5941bb7a3 is in history

Change-Id: I9b0525df547a8f79b739df90f39c2aad412de2c2
2020-03-17 15:48:50 +00:00
Automerger Merge Worker
579c2bd4af Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63
Change-Id: I5b44ff9afedcf40d82ba0c4666b2b16e72583383
2020-03-17 15:48:48 +00:00
Automerger Merge Worker
27d2d10b8b [automerger skipped] Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev am: 6e0d458d63 -s ours
am skip reason: Change-Id Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2 with SHA-1 5df8e985df is in history

Change-Id: If88006f48fc2f25ca989d830a37d651a75f68448
2020-03-17 15:48:31 +00:00
Automerger Merge Worker
5bc1ba2198 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311
Change-Id: I8c016464f6ba4b3237332bb2148183cb5d755ec4
2020-03-17 15:48:20 +00:00
Automerger Merge Worker
ba4aecf53c Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: b0dc78e311
Change-Id: I42c78c2626d1592bd5a0da215579f55bf04dc088
2020-03-17 15:48:00 +00:00
Automerger Merge Worker
c2dcb2f8e5 Merge "Shorten the output of NetworkAgentInfo#toString()." am: 5d089181a8
Change-Id: I73e47e19588a758fbee07ae96670b126251a9b56
2020-03-17 15:42:42 +00:00
Cody Kesting
d95e6de42f Merge "Add support for registering test networks with administrators." into rvc-dev 2020-03-17 15:31:26 +00:00
Cody Kesting
6e0d458d63 Merge "Protect ConnectivityService from SecurityException in permission check." into rvc-dev 2020-03-17 15:31:06 +00:00
Cody Kesting
b0dc78e311 Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev 2020-03-17 15:29:55 +00:00
Treehugger Robot
5d089181a8 Merge "Shorten the output of NetworkAgentInfo#toString()." 2020-03-17 15:29:39 +00:00
junyulai
5d89df732b [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
2020-03-17 14:59:59 +00:00
junyulai
9f288e6990 [SP24] Rename functions that add Entry unconditionally
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 unconditionally,
name them insertEntry.
  setIfaceValues -> insertEntry
  addEntry -> insertEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459
Merged-In: I801ddc49e283a254b9586700c9b597c0adb0d459
(cherry picked from aosp/1256352)
2020-03-17 14:59:31 +00:00
junyulai
2cb4c9359a [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
Merged-In: I141393f229e772d2eb9f7c156849e379bd71b845
(cherry picked from aosp/1253717)
2020-03-17 14:57:59 +00:00
Lorenzo Colitti
924fb4c08e Shorten the output of NetworkAgentInfo#toString().
Currently, printing a NetworkAgentInfo results in a very long
string. Make it a bit shorter by:

- Not printing a number of fields in NetworkInfo that are no
  longer used.
- Instead of printing flags regardless of whether they are true
  false, only print ones that are true. For example, this changes
    everCaptivePortalDetected{true} lastCaptivePortalDetected{false} captivePortalValidationPending{false}
  to:
    everCaptivePortalDetected
- Only printing clat information if clatd is started.

Also, put the long and variable-length fields lp and nc at the
end of the output.

Test: manual
Change-Id: I3312286be307ef1762890cbc6b717f12ce5b2b92
2020-03-17 22:29:37 +09:00
Automerger Merge Worker
4ac7ae7348 [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 skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d is in history

Change-Id: If68a189510466e69f18b591ccba94decc73432ac
2020-03-17 13:29:31 +00:00
Automerger Merge Worker
8df9d88504 [automerger skipped] Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566 am: 86ba38a5ba -s ours
am skip reason: Change-Id Ie30efa172f93a7557fb6ef56f4daf80e958c3787 with SHA-1 e93348f00d is in history

Change-Id: I3f81a90e806947d60fb8fe4f4856491284a43ed0
2020-03-17 13:15:17 +00:00
Automerger Merge Worker
86ba38a5ba Merge "Removing some of the API don't have to be @SystemApi" am: c4d6a4f566
Change-Id: I6687ba646982ea924feae7d8da6732a04184321e
2020-03-17 13:04:11 +00:00
Treehugger Robot
c4d6a4f566 Merge "Removing some of the API don't have to be @SystemApi" 2020-03-17 12:51:25 +00:00
Automerger Merge Worker
6667dbb0af Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44 am: ba33556f86
Change-Id: I275a8e2b66d1b3bac9eaf46f84f941fd7008156d
2020-03-17 10:28:54 +00:00
Automerger Merge Worker
ba33556f86 Merge changes I97015365,Ic9db4b9b am: d080a4a32d am: 1c25e4ff44
Change-Id: I058fcb4d7dac3ef384c3ccbe5a2cc880c6aed2a3
2020-03-17 10:16:15 +00:00
Automerger Merge Worker
1c25e4ff44 Merge changes I97015365,Ic9db4b9b am: d080a4a32d
Change-Id: Ic99385f58c7a0ee246d7dfeb12eb1723fda65c4b
2020-03-17 09:54:53 +00:00
Automerger Merge Worker
4bd3e6dacb [automerger skipped] Merge "services.net: Add a static library needed by wifi module" am: a0f5e8f3c2 am: 5cc4a63246 -s ours am: 56ccf539c3 -s ours
am skip reason: Change-Id Ifde69b579cfe5b813766f676acb10e436e64a44c with SHA-1 7cf9cb25e3 is in history

Change-Id: I7282fcc56290c105d7f3f03320503d53d31493fa
2020-03-17 09:39:06 +00:00
Automerger Merge Worker
349bfe3f32 [automerger skipped] Merge "services.net: Use the new ModuleNetworkStackClient" am: bcd6edb9d6 am: 8ad449dff9 -s ours am: 8d5189d6fb -s ours
am skip reason: Change-Id I065525fdbd64b9509ef0f47bb35954d267c65fd2 with SHA-1 1ce72ca363 is in history

Change-Id: I12824ac7895c44825aa0c64e972eff7ece8ee877
2020-03-17 09:38:53 +00:00
Chiachang Wang
d080a4a32d Merge changes I97015365,Ic9db4b9b
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
2020-03-17 09:38:41 +00:00
Automerger Merge Worker
ad7dad2742 [automerger skipped] Merge "Add test for NetworkAgentConfig" into rvc-dev am: b8f5f43f67 -s ours am: 2966ce4bee -s ours
am skip reason: Change-Id If9158d086bacb0ade94d59898ac223e4c8f4f73a with SHA-1 1feaacee76 is in history

Change-Id: I5b0eeb4c0ca0bfe389b2bf427cfcbf8a4d27e498
2020-03-17 09:36:15 +00:00