Commit Graph

3295 Commits

Author SHA1 Message Date
Paul Hu
e6a8ae7d33 Merge "Replace ConnectivityManager hidden symbols on framework" am: a8c71e23ae am: d084aacd4b am: 4cfec456d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0
2021-03-04 05:10:48 +00:00
Paul Hu
4cfec456d6 Merge "Replace ConnectivityManager hidden symbols on framework" am: a8c71e23ae am: d084aacd4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If400965e3260d8d310faee86e4edce4235130553
2021-03-04 04:23:42 +00:00
Paul Hu
d084aacd4b Merge "Replace ConnectivityManager hidden symbols on framework" am: a8c71e23ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83a8eb6c8cefd7f84448ad14acd97e6582a4d1e4
2021-03-04 03:11:45 +00:00
Paul Hu
a8c71e23ae Merge "Replace ConnectivityManager hidden symbols on framework" 2021-03-04 03:07:08 +00:00
Xin Li
0b16512982 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 490ecdadb4 -s ours am: 4d82258041 -s ours am: 3989cc2ce9 -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: I988e8a4b397af4360da97e97c79307ba62b155f6
2021-03-04 00:12:15 +00:00
Xin Li
3989cc2ce9 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 490ecdadb4 -s ours am: 4d82258041 -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
4d82258041 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 490ecdadb4 -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
490ecdadb4 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:39 +00:00
Yan Yan
ec9daff61c Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 63732807cc am: 9d9910483f am: 36abaf22d7
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
36abaf22d7 Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 63732807cc am: 9d9910483f
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
9d9910483f Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 63732807cc
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
a858a65be5 [automerger skipped] Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 0ea02c5fde am: bdad47c103 -s ours
am skip reason: Change-Id I11d4c9ab24de87fb2ad120e3787b78b73133e874 with SHA-1 124e136954 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
63732807cc Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" 2021-03-03 18:04:52 +00:00
Treehugger Robot
bdad47c103 Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 0ea02c5fde
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
0ea02c5fde 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
87107539df [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
124e136954 [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
4151b5af10 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: b101cb51c2 am: 558ffb553f am: 3df5cffa7d
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
3df5cffa7d Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: b101cb51c2 am: 558ffb553f
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
e54de80b26 Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: eb6ee0b29f am: c8268db856 am: 655adf3ec7
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
9537e6999c Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 408d00b4ee am: 44c1ef33d0 am: 99b83ae149
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
0041b9e712 Merge "Move UidRange to connectivity" am: 5a81037576 am: c4165d0728 am: 330296ddc3
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
558ffb553f Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: b101cb51c2
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
655adf3ec7 Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: eb6ee0b29f am: c8268db856
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
99b83ae149 Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 408d00b4ee am: 44c1ef33d0
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
c8268db856 Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: eb6ee0b29f
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
44c1ef33d0 Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: 408d00b4ee
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
330296ddc3 Merge "Move UidRange to connectivity" am: 5a81037576 am: c4165d0728
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
c4165d0728 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
b101cb51c2 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" 2021-03-02 18:24:27 +00:00
Treehugger Robot
eb6ee0b29f Merge "[FUI09] Expose NetworkStateSnapshot as system API" 2021-03-02 16:08:03 +00:00
junyulai
51392affe6 [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
408d00b4ee Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" 2021-03-02 13:21:32 +00:00
junyulai
73d79037dd [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
dd7831ded4 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
e32e65b7da Merge "[FUI08] Create NeworkStateSnapshot" am: 8300474cbb am: 9edfdbc01c am: 0d0ff24e13
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
6a495be227 Merge "Add support for tracking PANS data usage" am: 28160c6a11 am: 4c20b9b4c7 am: 8f2a244579
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
0d0ff24e13 Merge "[FUI08] Create NeworkStateSnapshot" am: 8300474cbb am: 9edfdbc01c
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
9edfdbc01c Merge "[FUI08] Create NeworkStateSnapshot" am: 8300474cbb
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
8300474cbb Merge "[FUI08] Create NeworkStateSnapshot" 2021-02-26 10:53:36 +00:00
junyulai
e553899c44 [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
51fa8bd6d0 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
220c004c1d Merge "Pivot network statistics to use DataInput/Output." into sc-dev 2021-02-26 01:19:45 +00:00
Chris Weir
8f2a244579 Merge "Add support for tracking PANS data usage" am: 28160c6a11 am: 4c20b9b4c7
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
4c20b9b4c7 Merge "Add support for tracking PANS data usage" am: 28160c6a11
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
28160c6a11 Merge "Add support for tracking PANS data usage" 2021-02-25 21:37:42 +00:00
Yan Yan
1745f3a759 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
60fe5aa059 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
1b4f0a409d 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
f01ec8abc3 Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 3e0c976af8 am: 9fcdfe35c5 am: d1912febe9
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