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
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
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
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
Xin Li
dd3848d115
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:39 +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
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
Lorenzo Colitti
1505fe6152
Merge changes Idfb5e149,Ia52b24c5 am: cfdaa84e64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ea9aed0e6c626ab0076260dab6ff9f657a82a30
2021-03-03 08:33:11 +00:00
Treehugger Robot
08ef7ddaff
Merge "Extend timeout for receiving broadcasts"
2021-03-03 07:52:41 +00:00
Aaron Huang
0d1be6406d
Remove PersistableBundle(Bundle) usage from ConnectivityService
...
Because the constuctor PersistableBundle(Bundle) is a hidden
API which is not visible to connectivity mainline module.
Currently, EVENT_NETWORK_TESTED and EVENT_DATA_STALL_SUSPECTED
are two events sent by ConnectivityService so they can build a
PersistableBundle directly and send PersistableBundle instead of
setting Bundle in the data field of the Message.
For EVENT_NETWORK_TESTED, add a new PersistableBundle member in
ConnectivityReportEvent so that the PersistableBundle can be
passed with ConnectivityReportEvent.
For EVENT_DATA_STALL_SUSPECTED, create a Pair<Long, PersistableBundle>
and put this in .obj of the Message, then the PersistableBundle can be
sent with timestampMillis together.
Bug: 177865050
Test: FrameworksNetTests
Change-Id: Ia2220f33f000e7c9439d97617cc08014dc4478a3
2021-03-03 15:43:30 +08:00
Remi NGUYEN VAN
27ed37105b
Extend timeout for receiving broadcasts
...
The test is currently flaky as broadcasts can take a long time
to be delivered, often more than 500ms.
Extend the timeout for broadcasts to 30s.
Historically the test would wait for broadcasts for at most 500ms,
but not verify that they were received before proceeding. This was
fixed recently by adding an assertion, but the assertion needs to
give enough time for the broadcast to be received.
Bug: 173331190
Change-Id: I0760f3418c635aa4d68de5aefdb7120a9d3e930b
Test: atest FrameworksNetTests
2021-03-03 06:26:16 +00:00
Lorenzo Colitti
3656709632
Address comments on aosp/1612040.
...
Bug: 174123988
Test: atest FrameworksNetTests
Change-Id: I550fe428d640aab6264aface21fbafb1fd268bff
2021-03-03 14:39:09 +09:00
Lorenzo Colitti
cfdaa84e64
Merge changes Idfb5e149,Ia52b24c5
...
* changes:
Stop using NetworkState internally in ConnectivityService.
Isolate an ad-hoc legacy API codepath.
2021-03-03 05:35:28 +00:00
Chalard Jean
ad0a6e6368
Fix a bug in RequestReassignment#toString
...
This fixes a small bug in debug code where the wrong
request would be displayed for RequestReassignment#toString.
Test: manual
Change-Id: Ie8d983593e67082eb818ef65bd8708e97596bce2
2021-03-03 14:24:13 +09:00
Sarah Chin
ce85c4c118
APIs for 5G slicing
...
Create TrafficDescriptor class
Create new APN ENTERPRISE
Update setupDataCall and DataCallResponse to take TrafficDescriptor and
matchAllRuleAllowed
Move ApnTypes from Annotation to ApnSetting
Bug: 179312227
Test: atest FrameworksTelephonyTests
Change-Id: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
Merged-In: I7433976bfe25bcb2af85ffb9338959cbcc9f42f3
2021-03-03 14:16:21 +09:00
Chalard Jean
dc97407cfc
Cleanup some of the PANS code
...
Test: FrameworksNetTests
Change-Id: I4d5cadfdd8e30a179948302e8c0c45f4d42b59ea
2021-03-03 14:16:21 +09:00
Remi NGUYEN VAN
29324f3d7a
Remove @hide CollectionUtils in QosCallbackTracker
...
Instead of using hidden symbols in the internal CollectionUtils, use the
CollectionUtils in libs/net that are intended for that usage.
Bug: 174541037
Test: m
Change-Id: Icb282bf2f38eb553eebc7d499bf92f22fae723cc
2021-03-03 13:12:27 +09:00
Remi NGUYEN VAN
1cc4f38770
Use Log instead of Slog in QosCallbackAgentConnection
...
Replace the hidden API Slog with the Log public API. Log is the utility
used by connectivity modularized code, which QosCallbackAgentConnection
is part of.
Change-Id: Ia50ec1cd3b8253ede010ec4fd1c37d9aa731d032
Test: m
Bug: 172050541
2021-03-03 03:13:34 +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