Commit graph

13,045 commits

Message SHA1
[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

lifr   authored and   Frank Li   commited 2021-03-03 10:17:52 +00:00
f1b0ca6ef8
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-03 08:55:28 +00:00
132b0dcbad
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-03 08:54:42 +00:00
12bbf1915e
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-03 08:51:04 +00:00
04707731d3
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-03 08:33:11 +00:00
1505fe6152
Merge "Extend timeout for receiving broadcasts"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-03 07:52:41 +00:00
08ef7ddaff
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

Aaron Huang   commited 2021-03-03 15:43:30 +08:00
0d1be6406d
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

Remi NGUYEN VAN   commited 2021-03-03 06:26:16 +00:00
27ed37105b
Address comments on aosp/1612040.
Bug: 174123988
Test: atest FrameworksNetTests
Change-Id: I550fe428d640aab6264aface21fbafb1fd268bff

Lorenzo Colitti   commited 2021-03-03 14:39:09 +09:00
3656709632
Merge changes Idfb5e149,Ia52b24c5
* changes:
  Stop using NetworkState internally in ConnectivityService.
  Isolate an ad-hoc legacy API codepath.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-03-03 05:35:28 +00:00
cfdaa84e64
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

Chalard Jean   commited 2021-03-03 14:24:13 +09:00
ad0a6e6368
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

Sarah Chin   authored and   Chalard Jean   commited 2021-03-03 14:16:21 +09:00
ce85c4c118
Cleanup some of the PANS code
Test: FrameworksNetTests
Change-Id: I4d5cadfdd8e30a179948302e8c0c45f4d42b59ea

Chalard Jean   commited 2021-03-03 14:16:21 +09:00
dc97407cfc
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

Remi NGUYEN VAN   commited 2021-03-03 13:12:27 +09:00
29324f3d7a
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

Remi NGUYEN VAN   commited 2021-03-03 03:13:34 +00:00
1cc4f38770
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

Frank Li   authored and   Automerger Merge Worker   commited 2021-03-03 02:17:26 +00:00
3ff134ee51
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-03 02:17:14 +00:00
cf2e3208f2
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-03 02:17:02 +00:00
c847b5cc35
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

Frank Li   authored and   Automerger Merge Worker   commited 2021-03-03 01:43:25 +00:00
737dd24aa0
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-03 01:40:15 +00:00
3506a1b335
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-03 01:34:48 +00:00
d81c20011a
Merge "[REIP01]Remove the IP connectivty metrics"
Frank Li   authored and   Gerrit Code Review   commited 2021-03-03 01:28:31 +00:00
2c1989a672
Merge "Use IDnsResolverUnsolicitedEventListener"
Paul Hu   authored and   Gerrit Code Review   commited 2021-03-03 01:08:27 +00:00
3503759a6f
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS"
Paul Hu   authored and   Gerrit Code Review   commited 2021-03-03 01:07:20 +00:00
3f250d1da0
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

Yan Yan   authored and   Automerger Merge Worker   commited 2021-03-02 21:29:39 +00:00
df431e094e
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

Yan Yan   authored and   Automerger Merge Worker   commited 2021-03-02 21:08:15 +00:00
7d67dda5c3
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 21:05:36 +00:00
2fd6d378c8
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 21:05:02 +00:00
c92d0ab048
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 20:52:02 +00:00
d73af919b6
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 20:47:52 +00:00
15c7e774c2
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 20:44:00 +00:00
405b9a0f54
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 20:43:46 +00:00
f9e689aa17
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 20:42:46 +00:00
0de430ef26
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 20:34:45 +00:00
090cc9ea64
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 20:27:29 +00:00
695e5f6f62
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 20:24:20 +00:00
beb3822e20
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 20:19:24 +00:00
dec716d6d3
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-02 20:16:39 +00:00
7afcfc90ee
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 20:08:28 +00:00
f685f49896
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 19:52:58 +00:00
b7f911ad07
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 19:52:44 +00:00
d0a8f0ab6e
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

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-03-02 19:52:05 +00:00
2ba7d87ea7
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

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-02 19:50:30 +00:00
24b2a334d0
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

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-02 19:49:13 +00:00
de7ef4ab0b
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 19:48:26 +00:00
f0b2caa08b
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

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-03-02 19:42:02 +00:00
600550be2f
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

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-02 19:13:55 +00:00
cf985cf03e
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

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-02 19:08:57 +00:00
25d2ee9e66
Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-02 18:46:39 +00:00
fc31f05aba
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC"
Yan Yan   authored and   Gerrit Code Review   commited 2021-03-02 18:24:27 +00:00
ca72617385