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
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
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
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
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
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