Treehugger Robot
d86b902b36
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e am: 010f29032c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7700b4ed9dd9105beb947944d63138330d8c565e
2021-03-04 14:51:09 +00:00
Treehugger Robot
010f29032c
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e am: 044ef2ba4e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icbc9b89121bcb09fde41deb3f71322005b1ea2ed
2021-03-04 13:46:09 +00:00
Treehugger Robot
044ef2ba4e
Merge changes Ie8d98359,I4d5cadfd am: 63383e755e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ec456b2f2fd88648461794dc2301a3825c3c155
2021-03-04 13:16:29 +00:00
Treehugger Robot
63383e755e
Merge changes Ie8d98359,I4d5cadfd
...
* changes:
Fix a bug in RequestReassignment#toString
Cleanup some of the PANS code
2021-03-04 12:39:04 +00:00
Aaron Huang
34c8f85c27
Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" into sc-dev
2021-03-04 07:49:16 +00:00
Treehugger Robot
ca0f404ff3
Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: e93b5d9bf3 am: fd5c00d173 am: e2fb23858f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2c4a517556e8fb397dcd64c3f121c90e40bd6d2
2021-03-04 06:53:18 +00:00
Treehugger Robot
e2fb23858f
Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: e93b5d9bf3 am: fd5c00d173
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8596a13bd869c8b2a26eefc1b8e30e7334b72f98
2021-03-04 06:11:58 +00:00
Aaron Huang
3ab02ee72e
Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: a1e34b2d6e am: d99f67aaf6 am: 92131bfd78
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f43cf1a8cfd61e6c9467679cd170dfacc70165d
2021-03-04 05:11:19 +00:00
Treehugger Robot
b3d8dfb289
Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: 9c6d3c889f am: 350f592cc9 am: c508365b28
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34b4be8343b0b86569f2ec73817b489aae794d92
2021-03-04 05:09:17 +00:00
Treehugger Robot
d758df46e8
Merge "Address comments on aosp/1612040." am: 0f6df3ba7d am: d0a19e01c1 am: 95340c3e69
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb
2021-03-04 05:08:52 +00:00
Frank Li
84ebd956f9
Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 6ef08c36a7 am: c5ed4d8124 am: e4bb3866d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d784ac885ffcbc7a4539cf6e5b4774af5c11c43
2021-03-04 05:08:28 +00:00
Junyu Lai
9872e34c5c
Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: f9d8415ef7 am: e301afdcfd am: 5a99734509
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48c92ae353490c05f1704b010b3c6f25505164c3
2021-03-04 05:06:53 +00:00
Treehugger Robot
fd5c00d173
Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: e93b5d9bf3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc65c4fb9c354b00ea98552021860170189ce15c
2021-03-04 05:02:00 +00:00
Aaron Huang
92131bfd78
Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: a1e34b2d6e am: d99f67aaf6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I07b7071eaedad69cac1908a872941a31002cefd0
2021-03-04 04:23:54 +00:00
Treehugger Robot
c508365b28
Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: 9c6d3c889f am: 350f592cc9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad988b171f6871e728381fa046f03765391bf5fd
2021-03-04 04:22:51 +00:00
Treehugger Robot
95340c3e69
Merge "Address comments on aosp/1612040." am: 0f6df3ba7d am: d0a19e01c1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I292f206377968a10052e0759d26819583e164b5a
2021-03-04 04:22:37 +00:00
Frank Li
e4bb3866d8
Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 6ef08c36a7 am: c5ed4d8124
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34df69bec5ee2bab2b8fd4e366f4d3967b471fd5
2021-03-04 04:22:20 +00:00
Treehugger Robot
e93b5d9bf3
Merge "Remove @hide CollectionUtils in QosCallbackTracker"
2021-03-04 04:22:18 +00:00
Junyu Lai
5a99734509
Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: f9d8415ef7 am: e301afdcfd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic41c4c6c923dea2a21ce7f4602e628743527b735
2021-03-04 04:22:06 +00:00
Aaron Huang
d99f67aaf6
Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: a1e34b2d6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I56756f9e45baa506cb304bd6c560c4129df7417a
2021-03-04 04:04:25 +00:00
Aaron Huang
a1e34b2d6e
Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService"
2021-03-04 03:50:50 +00:00
Treehugger Robot
350f592cc9
Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: 9c6d3c889f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d5362567ab4c9f510582261ef365edfaabceaf5
2021-03-04 03:01:11 +00:00
Treehugger Robot
9c6d3c889f
Merge "Use Log instead of Slog in QosCallbackAgentConnection"
2021-03-04 02:58:37 +00:00
Treehugger Robot
d0a19e01c1
Merge "Address comments on aosp/1612040." am: 0f6df3ba7d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2
2021-03-04 02:56:42 +00:00
Frank Li
c5ed4d8124
Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 6ef08c36a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8de53ff3755ae4f15bdaf1b4f6dbd1850e99ed94
2021-03-04 02:52:52 +00:00
Junyu Lai
e301afdcfd
Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: f9d8415ef7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I90895f9109aaa2fbe8d76b1b7904dff9d09cb512
2021-03-04 02:42:52 +00:00
Treehugger Robot
0f6df3ba7d
Merge "Address comments on aosp/1612040."
2021-03-04 02:04:36 +00:00
Frank Li
6ef08c36a7
Merge "[CS05]Remove the hidden API usage of MetricsLogger"
2021-03-04 01:34:53 +00:00
Junyu Lai
f9d8415ef7
Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager"
2021-03-04 01:24:57 +00:00
Xin Li
d4bb457213
[automerger skipped] Merge "Merge RQ2A.210305.007" am: dd3848d115 -s ours am: 6524622d0f -s ours am: 7ecf2cf1a7 -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
7ecf2cf1a7
[automerger skipped] Merge "Merge RQ2A.210305.007" am: dd3848d115 -s ours am: 6524622d0f -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
6524622d0f
[automerger skipped] Merge "Merge RQ2A.210305.007" am: dd3848d115 -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
Janis Danisevskis
0325b14121
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." into sc-dev
2021-03-03 22:28:41 +00:00
Xin Li
dd3848d115
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:39 +00:00
Sarah Chin
2a2ac396fd
[automerger skipped] Merge "APIs for 5G slicing" am: 564ab64fab am: 33315832c8 am: 2281c116ad -s ours
...
am skip reason: Change-Id I7433976bfe25bcb2af85ffb9338959cbcc9f42f3 with SHA-1 a5e4fc1359 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c13c91ef58cc52bceac6214aa3fef6f7802fe78
2021-03-03 20:24:13 +00:00
Automerger Merge Worker
c3a6ed089c
Merge "Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899 am: f2c389c4c5" into rvc-qpr-dev-plus-aosp am: 29ad2f4b42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba0f7e0c3a883d23901283b7fbfe822cdbae4ca6
2021-03-03 20:21:31 +00:00
Sarah Chin
2281c116ad
Merge "APIs for 5G slicing" am: 564ab64fab am: 33315832c8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1232091caedbe49009667c5f34af543bb5c5be07
2021-03-03 19:29:48 +00:00
James Mattis
3ce5c55680
Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899 am: f2c389c4c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a4cff353357a270f126a74d2648de755c64a6ee
2021-03-03 19:04:06 +00:00
Sarah Chin
33315832c8
Merge "APIs for 5G slicing" am: 564ab64fab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d2a9cd1442a1bd0f194d5bb2b17f98c3f29e747
2021-03-03 18:59:57 +00:00
Sarah Chin
564ab64fab
Merge "APIs for 5G slicing"
2021-03-03 18:42:20 +00:00
James Mattis
f2c389c4c5
Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I947176ec2f71fcddb7bc432b23917eef219562f3
2021-03-03 18:24:33 +00:00
James Mattis
f13bcb0899
Merge "Adding additional docs for OemNetworkPreferences"
2021-03-03 17:25:01 +00:00
Treehugger Robot
333bb77a5f
Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff am: 04707731d3 am: 132b0dcbad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ba4984427e72554c0aff2c173e72bdb93a9ea3c
2021-03-03 13:29:45 +00:00
Lorenzo Colitti
d3ee3d1750
Merge changes Idfb5e149,Ia52b24c5 am: cfdaa84e64 am: 1505fe6152 am: 12bbf1915e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3fe087370d66482d7699d569b32e364900f6dc3
2021-03-03 13:29:03 +00:00
junyulai
c9a235aadc
[FUI19] Migrate ConnectivityService to use NetworkStatsManager
...
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: Iaefd99f87ae96bc9d97d139bcd92a3fe8de917d2
2021-03-03 20:01:51 +08:00
lifr
f1b0ca6ef8
[CS05]Remove the hidden API usage of MetricsLogger
...
Legacy metrics are unused and deprecated, so they are being removed.
Therefore, delete the usage of the hidden MetricsLogger API.
Bug: 157966864
Test: atest CtsNetTestCases
atest CaptivePortalTest
atest ConnectivityServiceTest
Change-Id: I51241f5d50ec580015882c84dd917b015c700c7c
2021-03-03 10:17:52 +00:00
Treehugger Robot
132b0dcbad
Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff am: 04707731d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00c12a0b52948b8c2dd345b87e847c372e287571
2021-03-03 08:55:28 +00:00
Lorenzo Colitti
12bbf1915e
Merge changes Idfb5e149,Ia52b24c5 am: cfdaa84e64 am: 1505fe6152
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc26e2bbf443eba7e8ef5d5b1cbc78f041cd1401
2021-03-03 08:54:42 +00:00
Treehugger Robot
04707731d3
Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14924edf870ff55c334113f5d1583862be20e0f8
2021-03-03 08:51:04 +00:00
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