Xin Li
2ae3c09dda
[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours am: 301610b8c6 -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f023fd4fe72b6254cf51af02ca8bd5967e49549
2021-03-03 23:37:15 +00:00
Xin Li
301610b8c6
[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05ab53a6a483b8e4dbe40afe6dab40e2b7d328ea
2021-03-03 22:35:44 +00:00
Xin Li
d60cc74f32
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:39 +00:00
Yan Yan
42973053c1
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1 am: 36e1dd53f2 am: 3124399648
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I057bfdf8528b6f801fd5eb7d0757f19e81efa9a0
2021-03-03 20:22:42 +00:00
Yan Yan
3124399648
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1 am: 36e1dd53f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f3416d79ce8936f44edcf87231b902ea875f1d1
2021-03-03 19:05:30 +00:00
Yan Yan
36e1dd53f2
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I565eb522ff02784c36533be2eabb3267c2035991
2021-03-03 18:33:31 +00:00
Treehugger Robot
3b149e9e66
[automerger skipped] Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 11bb09eb21 am: 3e13b2767a -s ours
...
am skip reason: Change-Id I11d4c9ab24de87fb2ad120e3787b78b73133e874 with SHA-1 537b8cfe68 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8be40021b8ea631ed9375e893cfd556378bab2cc
2021-03-03 18:28:29 +00:00
Yan Yan
90b5d871e1
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"
2021-03-03 18:04:52 +00:00
Treehugger Robot
3e13b2767a
Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 11bb09eb21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1f3a928ed881ddd9826675f4729f35d9d0f1727
2021-03-03 17:22:35 +00:00
Treehugger Robot
11bb09eb21
Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b20786397ff83c0d086549a0d942c5703e31b9a
2021-03-03 16:21:54 +00:00
junyulai
f72320776d
[FUI18] Expose notifyNetworkStatus as system API
...
Test: m -j doc-comment-check-docs
Bug: 174123988
Merged-In: I11d4c9ab24de87fb2ad120e3787b78b73133e874
Change-Id: I11d4c9ab24de87fb2ad120e3787b78b73133e874
(cherry-picked from ag/13749978)
2021-03-03 20:01:46 +08:00
junyulai
537b8cfe68
[FUI18] Expose notifyNetworkStatus as system API
...
Test: m -j doc-comment-check-docs
Bug: 174123988
Change-Id: I11d4c9ab24de87fb2ad120e3787b78b73133e874
2021-03-03 15:34:42 +08:00
Yan Yan
44b5fb7c5f
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: d3a444609a am: ecc13abaa0 am: ee9f2d38dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63
2021-03-02 21:35:55 +00:00
Yan Yan
ee9f2d38dd
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: d3a444609a am: ecc13abaa0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ab124e454f007c0330de636bc9e8b2729fcf4dd
2021-03-02 21:29:39 +00:00
Treehugger Robot
af20002be1
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: c061f0053e am: 2f5b7f8155 am: ae23751ac7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41be29daeba58378ab374c346684a3d205f0d7c9
2021-03-02 21:10:48 +00:00
Treehugger Robot
695093e745
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 1ad27ef2a1 am: 8e8f318c1f am: 8396dbf036
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2207873ffb549f26026e33f14440be494e4b4175
2021-03-02 21:10:19 +00:00
Remi NGUYEN VAN
1f1c2d72ee
Merge "Move UidRange to connectivity" am: 5a81037576 am: 8819459e4a am: ed6b830d7b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3
2021-03-02 21:09:32 +00:00
Yan Yan
ecc13abaa0
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: d3a444609a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9cc8508fb44e10371bc76bb31f20340f8663b18
2021-03-02 21:08:15 +00:00
Treehugger Robot
ae23751ac7
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: c061f0053e am: 2f5b7f8155
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib59b32356b55200798c5e8c6f85174049b99770c
2021-03-02 21:05:36 +00:00
Treehugger Robot
8396dbf036
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 1ad27ef2a1 am: 8e8f318c1f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a804c1011080df3b09b01930817b5d0c46cef4a
2021-03-02 21:05:02 +00:00
Treehugger Robot
2f5b7f8155
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: c061f0053e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8eb6681328ad1f4a85bcc8c6c4b9446c23616b7a
2021-03-02 20:52:02 +00:00
Treehugger Robot
8e8f318c1f
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 1ad27ef2a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b19538843007e38e170163120f38477e4b76be8
2021-03-02 20:47:52 +00:00
Remi NGUYEN VAN
ed6b830d7b
Merge "Move UidRange to connectivity" am: 5a81037576 am: 8819459e4a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic05c10eca12c3c43190c767b4cef6ad88a0835f5
2021-03-02 20:43:46 +00:00
Remi NGUYEN VAN
8819459e4a
Merge "Move UidRange to connectivity" am: 5a81037576
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I672615b0804b9a9de4befa1ba5aea2efb9c962df
2021-03-02 20:24:20 +00:00
Yan Yan
d3a444609a
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC"
2021-03-02 18:24:27 +00:00
Treehugger Robot
c061f0053e
Merge "[FUI09] Expose NetworkStateSnapshot as system API"
2021-03-02 16:08:03 +00:00
junyulai
7c17de401b
[FUI09] Expose NetworkStateSnapshot as system API
...
This is needed by NetworkStatsService and
NetworkPolicyManagerService to utilize the snapshots of
information of networks that grabbed from ConnectivityService.
Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I7e974ef7b23ba9ba6ee775eed9899b0c0e2eca55
2021-03-02 23:09:16 +08:00
Treehugger Robot
1ad27ef2a1
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot"
2021-03-02 13:21:32 +00:00
junyulai
125631330d
[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot
...
This change migrates NetworkStatsService and related code to use
NetworkStateSnapshot which is used for replacing the NetworkState.
This patch also changes some formating which is suggested by
the linter.
Test: FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I547da8f411cb45bdadc376ac3cadf3f3c55bb282
2021-03-02 20:08:53 +08:00
Remi NGUYEN VAN
1bc09ccb14
Move UidRange to connectivity
...
UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.
Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.
Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
2021-03-02 15:35:36 +09:00
Junyu Lai
364395f0ec
Merge "[FUI08] Create NeworkStateSnapshot" am: 18f51bd23d am: 0cd3ebb43d am: f5b4ec8293
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5f3cfbdd6f3b23007ea7a2581a75088ed96714f
2021-03-01 08:10:22 +00:00
Chris Weir
37eedbac6e
Merge "Add support for tracking PANS data usage" am: dbedad0dd5 am: 16e2ef942a am: 24e858dc96
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d586ff455baccbf87f0ffb835af83c90735ba56
2021-03-01 07:59:54 +00:00
Junyu Lai
f5b4ec8293
Merge "[FUI08] Create NeworkStateSnapshot" am: 18f51bd23d am: 0cd3ebb43d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a88984dbd2c8171837bd1cf2e58ed07c1d6c0d7
2021-02-26 12:43:58 +00:00
Junyu Lai
0cd3ebb43d
Merge "[FUI08] Create NeworkStateSnapshot" am: 18f51bd23d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6f0e981228ef886496f55626b499f9c487af320
2021-02-26 11:30:53 +00:00
Junyu Lai
18f51bd23d
Merge "[FUI08] Create NeworkStateSnapshot"
2021-02-26 10:53:36 +00:00
junyulai
8f1eb24a94
[FUI08] Create NeworkStateSnapshot
...
Since NetworkState has UnsupportedAppUsage APIs that cannot
be changed, create another class for follow-up patches
to expose as system API.
Test: NetworkStateSnapshotTest
Bug: 174123988
Change-Id: I54ef872847f34166aa34a79f6178c90ac12b6c72
2021-02-26 11:57:06 +08:00
paulhu
da479fa1a4
Replace ConnectivityManager hidden symbols on framework
...
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Telephony on framework.
Bug: 180693313
Test: atest FrameworksNetTests
Change-Id: I14e032ad6f278a36e8756aa7045d73a403f8f059
2021-02-26 11:19:41 +08:00
Jeff Sharkey
0917f5d15f
Merge "Pivot network statistics to use DataInput/Output." into sc-dev
2021-02-26 01:19:45 +00:00
Chris Weir
24e858dc96
Merge "Add support for tracking PANS data usage" am: dbedad0dd5 am: 16e2ef942a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iffa334fef43ad248173703d34864d859668225a1
2021-02-25 22:27:50 +00:00
Chris Weir
16e2ef942a
Merge "Add support for tracking PANS data usage" am: dbedad0dd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If14211a988289a217c9eabb3cd43bc41959de346
2021-02-25 21:50:22 +00:00
Chris Weir
dbedad0dd5
Merge "Add support for tracking PANS data usage"
2021-02-25 21:37:42 +00:00
Yan Yan
272ee7c909
Use VERSION_CODES.S instead of VERSION_CODES.R + 1
...
Bug: 170424293
Test: IpSecAlgorithmTest
Change-Id: I4662b0d43c476b744536a41000d578e8b69286ef
2021-02-25 10:40:24 -08:00
Yan Yan
f72b01527f
Support new IpSecAlgorithm AUTH_AES_CMAC
...
Bug: 161716062
Test: IpSecAlgorithmTest, verified with CTS
Change-Id: Ideaf4225bd851fad8c8072505c6ad99d85ba616e
2021-02-25 10:35:10 -08:00
Jeff Sharkey
daa23607be
Pivot network statistics to use DataInput/Output.
...
The majority of this refactoring has already landed in AOSP, and this
small CL is the remaining piece needed to begin using the new
optimized classes which only exist in the internal tree.
This is a no-op refactoring.
Bug: 176777285
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ifd7ac95c6cd6761e7d03cbf381dcc9e32b6406aa
2021-02-24 13:54:20 -07:00
Lucas Lin
fbfb9b924a
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 1e70c22af9 am: d1f4d2881f am: 0c0ca691f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I032e3d8f16b164f067dba02bde950b93f4e54b83
2021-02-23 22:56:46 +00:00
Lucas Lin
0c0ca691f1
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 1e70c22af9 am: d1f4d2881f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic520c715578c8c5dd70040bbdc4c535330b0a453
2021-02-23 22:46:54 +00:00
Lucas Lin
d1f4d2881f
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 1e70c22af9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0428b441b34d48157a28dfc0463976be135146f4
2021-02-23 22:27:15 +00:00
Xin Li
3d24c2cad7
[automerger skipped] Merge ab/7061308 into stage. am: e9a1554fea -s ours am: edeb7e0203 -s ours
...
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I831ba618445a338cc57e0cdbff65e3c44aeaf93f
2021-02-23 10:35:03 +00:00
Xin Li
edeb7e0203
[automerger skipped] Merge ab/7061308 into stage. am: e9a1554fea -s ours
...
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie387abaa6af0c76ebd6801707d21443ebbda5c93
2021-02-23 09:05:19 +00:00
Lucas Lin
1e70c22af9
Merge changes I852e3a53,I86755647,I0ed8b0c6
...
* changes:
Remove unused INetworkManagementService from IpSecService
Use NetdUtils instead of NetworkManagementService in Vpn
Use NetdUtils instead of NetworkManagementService in IpSecService
2021-02-22 06:49:39 +00:00