Commit Graph

97676 Commits

Author SHA1 Message Date
Shuo Qian
e56e9d7dcc Merge "API Council Feedbacks" am: c4243e05d0 am: 5ece852ca1
Change-Id: I640798a2cd22f0144684b66db7998522e6f19019
2020-03-18 20:26:11 +00:00
sqian
a64f352596 API Council Feedbacks
1) Add Annotation for getCarrirPrivilegeStatus
2) Remove NullProinterException throwing in isDataConnectionAllowed
3) Add SdkConstant for ACTION_UPDATE_EMRGENCY_NUMBER_DB

Test: Treehugger
Bug: 148218347
Bug: 151455822
Change-Id: I4943491abf70641f9379862a67941295a4cf67f9
Merged-In: I4943491abf70641f9379862a67941295a4cf67f9
(cherry picked from commit 43c2f470ed)
2020-03-18 18:28:21 +00:00
Amit Mahajan
63dcb81f4d Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab5d am: a558fae2e7
Change-Id: I93a84835b116d26069bec1f87601f131234166bc
2020-03-18 16:06:01 +00:00
Amit Mahajan
0aa828ab5d Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" 2020-03-18 15:31:08 +00:00
Lorenzo Colitti
4bb149d27b Merge "mtu: Add MTU parameter to Routes" am: 47c884dc67 am: 0784058909
Change-Id: If67ccf671b2f2739bb4f01472c2f832c1f202cc5
2020-03-18 07:52:28 +00:00
Lorenzo Colitti
47c884dc67 Merge "mtu: Add MTU parameter to Routes" 2020-03-18 07:20:01 +00:00
Junyu Lai
193b961046 Merge "[SP25] Rename functions that add Entry conditionally" am: 2c7aa1f5ab am: fa0c13512d
Change-Id: I59d965fa3a67be4994fe19a2f91e30d2ef114f81
2020-03-18 04:02:41 +00:00
Junyu Lai
2c7aa1f5ab Merge "[SP25] Rename functions that add Entry conditionally" 2020-03-18 03:16:41 +00:00
junyulai
5a1b9fce65 [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
Amit Mahajan
5a29b0447b Revert "Expose ACTION_USER_SWITCHED as system API"
This reverts commit ffe0cbe5ca.

Reason for revert: Not needed for now; will be redone in S.

Bug: 148180958
Change-Id: I426e00e1eb79af5b520fc8c59439614459720fa6
2020-03-18 00:19:53 +00:00
Automerger Merge Worker
d0514f81d0 Merge "Update ConnectivityDiagnosticsCallback function name." am: 35cba128cb am: ee0f856d32
Change-Id: Ie6123e8cb461f3803a7e88ebfced68e19c8e14b6
2020-03-17 19:28:26 +00:00
Cody Kesting
35cba128cb Merge "Update ConnectivityDiagnosticsCallback function name." 2020-03-17 19:00:39 +00:00
Cody Kesting
40f23ffb38 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
026a8b4a96 Merge "Shorten the output of NetworkAgentInfo#toString()." am: 6f2c32ff38 am: 18d49f72f2
Change-Id: I480aefc8b072cb7f186690ca05b730244bd460d6
2020-03-17 15:55:07 +00:00
Treehugger Robot
6f2c32ff38 Merge "Shorten the output of NetworkAgentInfo#toString()." 2020-03-17 15:29:39 +00:00
Lorenzo Colitti
751ce74a7d 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
4468f3c716 Merge "Removing some of the API don't have to be @SystemApi" am: 66a82eecd2 am: 3e114f829e
Change-Id: I1ac545b986a0e43f2da5a9008243d8b1df3f8fc4
2020-03-17 13:15:23 +00:00
Treehugger Robot
66a82eecd2 Merge "Removing some of the API don't have to be @SystemApi" 2020-03-17 12:51:25 +00:00
Automerger Merge Worker
16c33f8b93 Merge changes I97015365,Ic9db4b9b am: 942c83c757 am: 2dc48eb227
Change-Id: I8e7ea75661fad300057239d99c106c55a6bdf54d
2020-03-17 10:15:53 +00:00
Chiachang Wang
942c83c757 Merge changes I97015365,Ic9db4b9b
* changes:
  Add NattKeepalivePacketDataTest
  Add KeepalivePacketDataTest
2020-03-17 09:38:41 +00:00
Automerger Merge Worker
9f5e0aa7c1 Merge "services.net: Add a static library needed by wifi module" am: 488efe3350 am: 2b024e7593
Change-Id: I87011f46dceed7cad38b2f858e5fdf39bba0d6a8
2020-03-17 09:35:35 +00:00
Treehugger Robot
488efe3350 Merge "services.net: Add a static library needed by wifi module" 2020-03-17 09:22:12 +00:00
Automerger Merge Worker
9a415dedb6 Merge "Move sensitive field parceling bool to constructor" am: ab5fdfa7cd am: 28c13929db
Change-Id: Iaef82bcc36b9ad4ab515f62ab1e1ac4c9882808b
2020-03-17 08:17:33 +00:00
Chiachang Wang
cc4ed0c621 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
2020-03-17 15:48:02 +08:00
Remi NGUYEN VAN
ad7ddfd7f8 Move sensitive field parceling bool to constructor
This addresses API review comments recommending to use a copy
constructor with additional parameters instead of a dedicated method.
makeSensitiveFieldsParcelingCopy becomes LinkProperties(base, true).

Bug: 150877475
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Change-Id: Ib145ca7f36dcbee6ef47d09862a181fc04a28f03
2020-03-17 11:42:33 +09:00
Automerger Merge Worker
35a5b33540 Merge "Add method in Handler to remove messages with equal object" am: 36216f6f23 am: ed0ddab0d7
Change-Id: I6edcb322c66c7ceaee0e595fba2bec6e0674f4a3
2020-03-17 02:13:01 +00:00
Treehugger Robot
36216f6f23 Merge "Add method in Handler to remove messages with equal object" 2020-03-17 01:42:01 +00:00
fengjinlan
f30f5a3b9f Add method in Handler to remove messages with equal object
Change-Id: Ibae80f5008df54f4ac8544abb4cc5863ea3db86d
Signed-off-by: fengjinlan <fengjinlan@xiaomi.com>
2020-03-17 00:01:42 +00:00
Automerger Merge Worker
99a5a61c51 Merge "Add OWNERS file for role." am: 5f00139706 am: 0958898aaf
Change-Id: If14c81641f0233835bb36c5f5f71de94881b64b9
2020-03-16 23:25:50 +00:00
Hai Zhang
5f00139706 Merge "Add OWNERS file for role." 2020-03-16 22:55:07 +00:00
Automerger Merge Worker
ab39e1bb7c Merge "Add support for registering test networks with administrators." am: 84091b4c50 am: f1cb6c71bf
Change-Id: Ia50086e3871fcc5a3a0d904ad4ad2a742f3b5d6f
2020-03-16 18:32:55 +00:00
Hai Zhang
9173da8f8a Add OWNERS file for role.
Test: build
Change-Id: Ib22925c0bdb97ea97964ad9fb08222ca27facbab
2020-03-16 11:03:12 -07:00
Cody Kesting
84091b4c50 Merge "Add support for registering test networks with administrators." 2020-03-16 18:02:55 +00:00
Automerger Merge Worker
d028b79de3 Merge changes I801ddc49,Id1b8f41b am: ba350f4652 am: 16e7eb9224
Change-Id: Ibc0b7c74ce55198fc6804b5cf1ea414aad912a4f
2020-03-16 11:56:19 +00:00
Treehugger Robot
ba350f4652 Merge changes I801ddc49,Id1b8f41b
* changes:
  [SP24] Rename functions that add Entry unconditionally
  [SP23] Address misc API review comment about NetworkStats
2020-03-16 11:38:00 +00:00
Automerger Merge Worker
c822c1d807 Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" am: 4db4933c81 am: 288837ff3d
Change-Id: I0a4f3553330651ab274ff3521e404d3408450678
2020-03-16 10:36:19 +00:00
Lucas Lin
4db4933c81 Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" 2020-03-16 10:08:51 +00:00
Aaron Huang
8173b63126 Removing some of the API don't have to be @SystemApi
Some of the API we made @SystemApi won't be used by mainline
module. Removing these from the surface.

Bug: 151266974
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      atest FrameworksWifiTests

Change-Id: Ie30efa172f93a7557fb6ef56f4daf80e958c3787
Merged-In: Ie30efa172f93a7557fb6ef56f4daf80e958c3787
2020-03-16 17:39:41 +08:00
junyulai
fd661f5db8 [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
2020-03-16 14:27:45 +08:00
junyulai
c7e614d0f3 [SP23] Address misc API review comment about NetworkStats
This change add several javadoc for NetworkStats and its Entry
class. Also remove IFACE_ALL constant accordlingly.

Test: atest FrameworkNetTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: Id1b8f41be79f847ad73197ff0e18258b6ee8a730
2020-03-16 14:27:45 +08:00
Automerger Merge Worker
594ae348c8 Merge "USB: Add OWNERS for USB functionality" am: cc13533098 am: 9613717da2
Change-Id: Ic24691a778b740a2e8c322de33559c1e0476c7ee
2020-03-16 05:07:02 +00:00
Treehugger Robot
cc13533098 Merge "USB: Add OWNERS for USB functionality" 2020-03-16 04:30:34 +00:00
Automerger Merge Worker
34e03cc8ad [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd am: c13c880914
Change-Id: Ia5e64eb524a852539850f46df87a6b28d4910cbc
2020-03-16 03:13:45 +00:00
Automerger Merge Worker
c13c880914 [SP21] Address comments for API council review about aosp/1172143 am: 393e10d4cd
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
Junyu Lai
240f5bb4e9 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
lucaslin
86e560c749 Add some comments in isAlwaysOnVpnLockdownEnabled
Bug: 141621373
Test: Build pass.
Change-Id: Ib9df71192937164ff95ce564195d5d68508ec69d
2020-03-16 09:40:01 +08:00
Roshan Pius
eb7edd5620 services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.

Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
Merged-In: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-16 00:23:42 +00:00
Automerger Merge Worker
88522be63c Merge "Added OWNERS file for inputmethod" am: 80e92b670d am: c54682b084
Change-Id: I09843e792939e9bd2625c8fdf1ca734dd5872f82
2020-03-14 04:55:44 +00:00
Treehugger Robot
80e92b670d Merge "Added OWNERS file for inputmethod" 2020-03-14 04:22:17 +00:00
Automerger Merge Worker
54c7cff5b5 Merge "Add @RequiresPemission compat framework APIs." am: 9a3446e067 am: e58704e2be
Change-Id: Ia935f69038e648bbc7b92b3e5c25ba16d9855a31
2020-03-13 19:50:59 +00:00