Aaron Huang
d101ec8f87
Use NetworkCallback in BatteryStatsService to get connectivity change
...
Currently, battery stats service uses noteConnectivityChanged in
connectivity service(CS) to pass connection state and the type of
connection for BatteryStats. However, CS is going to be a mainline
module which can only access formal API. noteConnectivityChanged
is a hidden API and it pass LegacyNetworkType which has been
deprecated years ago, so it should avoid to expose this API with
a deprecated argument. Thus, register a NetworkCallback in
BattyeryStatsService to listen the network capabilities changed to
remove the noteConnectivityChanged from connectivity service.
Besides, let noteConnectivityChanged take display transport instead
of legacy network type.
Bug: 171686421
Test: atest FrameworksNetTests
atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I3dac94ec06f673aa719e124f1ef3d8169f68f9fb
2021-03-03 08:40:28 +00:00
Frank Li
2882f70290
Merge "[REIP01]Remove the IP connectivty metrics" am: 2c1989a672 am: 737dd24aa0 am: 3ff134ee51
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607896
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82731f95fa01eed86d4aca5fe220b1cb01107f5c
2021-03-03 02:22:50 +00:00
Paul Hu
e7c56922dc
Merge "Use IDnsResolverUnsolicitedEventListener" am: 3503759a6f am: 3506a1b335 am: cf2e3208f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifb6141adf3eeb096ac610e01a458d47492e68ea0
2021-03-03 02:22:31 +00:00
Paul Hu
02840d8a68
[automerger skipped] Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 am: d81c20011a am: c847b5cc35 -s ours
...
am skip reason: Change-Id I6f03398c1735b89470ad5bdbe3a036929daeb53c with SHA-1 acae8dde4b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9e11c925da1cb7a94c812f68b60c77350c26770
2021-03-03 02:22:14 +00:00
Frank Li
3ff134ee51
Merge "[REIP01]Remove the IP connectivty metrics" am: 2c1989a672 am: 737dd24aa0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607896
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idaa8aed7d02ea1fcf7f6046683c37bb23e153dab
2021-03-03 02:17:26 +00:00
Paul Hu
cf2e3208f2
Merge "Use IDnsResolverUnsolicitedEventListener" am: 3503759a6f am: 3506a1b335
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iabcc9dc41b5e51920c7d67d89c90e1e2c7e3e45c
2021-03-03 02:17:14 +00:00
Paul Hu
c847b5cc35
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 am: d81c20011a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad6f9e6cabc5f7eccd0aad020b398950f0495703
2021-03-03 02:17:02 +00:00
Frank Li
737dd24aa0
Merge "[REIP01]Remove the IP connectivty metrics" am: 2c1989a672
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607896
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23251128cb1576002b2b5e0642e9c274d071b7dd
2021-03-03 01:43:25 +00:00
Paul Hu
3506a1b335
Merge "Use IDnsResolverUnsolicitedEventListener" am: 3503759a6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd84037196d9ee7140869e17a3082aad2bed7599
2021-03-03 01:40:15 +00:00
Paul Hu
d81c20011a
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ad8f2d923e9415460c02002750a3766978272a6
2021-03-03 01:34:48 +00:00
Frank Li
2c1989a672
Merge "[REIP01]Remove the IP connectivty metrics"
2021-03-03 01:28:31 +00:00
Paul Hu
3503759a6f
Merge "Use IDnsResolverUnsolicitedEventListener"
2021-03-03 01:08:27 +00:00
Paul Hu
3f250d1da0
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS"
2021-03-03 01:07:20 +00:00
Yan Yan
56c8a12db7
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 am: 7d67dda5c3 am: df431e094e
...
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
df431e094e
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 am: 7d67dda5c3
...
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
62162a5b32
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d am: d73af919b6 am: 2fd6d378c8
...
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
49e0aa90b2
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f am: 15c7e774c2 am: c92d0ab048
...
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
c84a254fad
Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 am: 695e5f6f62 am: 405b9a0f54
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib37a92a20b907faed245cca914b46be9b8c1e7fb
2021-03-02 21:09:58 +00:00
Remi NGUYEN VAN
c56f454f3c
Merge "Move UidRange to connectivity" am: ea3a01abf9 am: beb3822e20 am: f9e689aa17
...
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
Treehugger Robot
2470567906
Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3 am: 0de430ef26
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7bf0262dc4542e8cdf07ebf19a3367fa9b57f385
2021-03-02 21:09:13 +00:00
Yan Yan
7d67dda5c3
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385
...
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
2fd6d378c8
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d am: d73af919b6
...
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
c92d0ab048
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f am: 15c7e774c2
...
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
d73af919b6
Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d
...
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
15c7e774c2
Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f
...
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
405b9a0f54
Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 am: 695e5f6f62
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710
2021-03-02 20:44:00 +00:00
Remi NGUYEN VAN
f9e689aa17
Merge "Move UidRange to connectivity" am: ea3a01abf9 am: beb3822e20
...
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
Treehugger Robot
0de430ef26
Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I173d225caf28c63a7cccbaf090c783775a6e01ec
2021-03-02 20:42:46 +00:00
Treehugger Robot
c4262b0bd3
Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5 am: 7afcfc90ee am: 090cc9ea64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4be300f99c296816bef118389fe0c0f4effb7a9d
2021-03-02 20:38:10 +00:00
Remi NGUYEN VAN
27955ae85b
Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65 am: b7f911ad07 am: f685f49896
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib253a7ccf3beb8e9e5d0988db3d0662074dedda7
2021-03-02 20:37:24 +00:00
Treehugger Robot
090cc9ea64
Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5 am: 7afcfc90ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I279528bf95a7cf575dad9965eac627cd52e6cca8
2021-03-02 20:34:45 +00:00
Remi NGUYEN VAN
695e5f6f62
Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11b9be22935b9fd7cf53b268103a1ce4635a6afd
2021-03-02 20:27:29 +00:00
Remi NGUYEN VAN
beb3822e20
Merge "Move UidRange to connectivity" am: ea3a01abf9
...
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
Treehugger Robot
dec716d6d3
Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22df4afec8f8b5024d099966c0ca0f78b55ff08a
2021-03-02 20:19:24 +00:00
Treehugger Robot
7afcfc90ee
Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5dd6577a57be2234014527e3bd517b60c4fecb48
2021-03-02 20:16:39 +00:00
Remi NGUYEN VAN
f685f49896
Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65 am: b7f911ad07
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4cc62d59b1da5053a4af976e30d411d8f066bbcc
2021-03-02 20:08:28 +00:00
Remi NGUYEN VAN
789c256e69
Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5 am: f0b2caa08b am: d0a8f0ab6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9de14464ebb9d43e7c4fdc683c23ddbbcc7ef269
2021-03-02 19:56:48 +00:00
Aaron Huang
9709299a10
Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f am: 2ba7d87ea7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3152ffcebf8b51e170cbd70e59c2810c4548d1ca
2021-03-02 19:55:43 +00:00
Lucas Lin
dca35b322f
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e am: 24b2a334d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e
2021-03-02 19:55:02 +00:00
Lucas Lin
2d939b27d4
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66 am: de7ef4ab0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb
2021-03-02 19:54:22 +00:00
Remi NGUYEN VAN
459bb01e4c
Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be am: fc31f05aba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b7416a1d5c8103415246016f43dddc932d0be2b
2021-03-02 19:53:40 +00:00
Remi NGUYEN VAN
b7f911ad07
Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id81273b33752ff353dfebdd2cd3faf43429f1a29
2021-03-02 19:52:58 +00:00
Remi NGUYEN VAN
d0a8f0ab6e
Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5 am: f0b2caa08b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icb9911ad2933d76acbfc8b23463639ffc82bb58b
2021-03-02 19:52:44 +00:00
Aaron Huang
2ba7d87ea7
Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760
2021-03-02 19:52:05 +00:00
Lucas Lin
24b2a334d0
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieff3c3cc14319782e264ed9b4a287b5581e6da90
2021-03-02 19:50:30 +00:00
Lucas Lin
de7ef4ab0b
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
2021-03-02 19:49:13 +00:00
Remi NGUYEN VAN
f0b2caa08b
Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2d4b5574ba710eb50c438144e2b87f6c8954336
2021-03-02 19:48:26 +00:00
Aaron Huang
600550be2f
Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1085391b5649df72b6664d5cdf1756c5110287dc
2021-03-02 19:42:02 +00:00
Lucas Lin
cf985cf03e
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
2021-03-02 19:13:55 +00:00
Lucas Lin
25d2ee9e66
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
2021-03-02 19:08:57 +00:00