Commit Graph

12540 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
68d10c47df Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00949470243a8ca63b401810bc9cb4ad3631e038
2021-03-05 06:19:52 +00:00
Chalard Jean
e05c37b5ec Merge "Generalize some PANS methods" am: b639d79547 am: 9b385fa220
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9203b1f45d072694bffad33f6e4e9d4b12185a4a
2021-03-05 06:19:21 +00:00
Remi NGUYEN VAN
4386582dd2 Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb729be68e810972506b1d8a3960dfc371a294b1
2021-03-05 05:50:47 +00:00
Chalard Jean
9b385fa220 Merge "Generalize some PANS methods" am: b639d79547
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7baa17a0f882ec21f766c9f7dc2c0694853fb467
2021-03-05 05:47:57 +00:00
Chiachang Wang
dc14b38157 Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72 am: 658a53ccef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63ec8e62d944828c1c6c7b9fa948a60a87f7d9e7
2021-03-05 05:43:32 +00:00
Janis Danisevskis
bb865ae949 Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77346383545bd79d9406b5711f969e07eb1e66f0
2021-03-05 05:41:50 +00:00
Chiachang Wang
658a53ccef Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f9e9d496c92e86609871c93a08b819b3704314f
2021-03-05 05:37:43 +00:00
Treehugger Robot
42b8c94fae Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5bf1fc2b06fb5339ffd9b43d0eda893a4bbc4bd
2021-03-05 05:18:27 +00:00
Janis Danisevskis
d8fb75701d Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97b24a5462f42773df919bd1d7acf9a9c5dcd43c
2021-03-05 05:17:12 +00:00
Remi NGUYEN VAN
a923322f24 Merge "Replace user with debuggable check in ConnectivityService" 2021-03-05 05:09:46 +00:00
Treehugger Robot
a2229ce85b Merge "Fix CaptivePortalTest before R" am: 73e63132a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
2021-03-05 05:03:21 +00:00
Chalard Jean
b639d79547 Merge "Generalize some PANS methods" 2021-03-05 04:48:39 +00:00
Chiachang Wang
86dce50c72 Merge "Have the DataConnectionStat started from BSS" 2021-03-05 02:59:33 +00:00
Janis Danisevskis
c410b053b9 Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." 2021-03-05 02:57:34 +00:00
Treehugger Robot
73e63132a6 Merge "Fix CaptivePortalTest before R" 2021-03-05 02:28:55 +00:00
Chalard Jean
e585766e12 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe am: 2a22bdeec6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28ac065b0574c94c8d8b0dfabaf15db0694b4f90
2021-03-04 13:46:18 +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
Chalard Jean
2a22bdeec6 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic64d571ff8a1f2fdf6b15cde12c6b0a38b4a74b4
2021-03-04 13:18:57 +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
Chalard Jean
9a3a0eac07 Generalize some PANS methods
These methods will be reused for 5G slicing and should
have a more generic name/signature.

This is a no-op refactoring.

Test: FrameworksNetTests
Change-Id: I13cf9fc405fef7dc650d5ea7df44d025f6713b46
2021-03-04 22:15:27 +09:00
Remi NGUYEN VAN
2c6d33f451 Replace user with debuggable check in ConnectivityService
IS_USER is a hidden symbol, whereas IS_DEBUGGABLE is part
of the module API.
The check is generally equivalent, as non-user builds are eng or
userdebug, which are debuggable.

Bug: 170598012
Change-Id: I7d09939652844eb2e3a6f0200b1ba50691a147da
Test: atest FrameworksNetTests
2021-03-04 13:12:34 +00:00
Chalard Jean
f0717a9ffe Merge changes Ide2567b2,I0ee0ce92,Iac3f55af
* changes:
  Fix a bug where callbacks would see blips
  Fix a bug where a request would not be refcounted
  Fix a bug where UID ranges would not be removed
2021-03-04 13:12:20 +00:00
Chalard Jean
018dbe4182 Fix a bug where callbacks would see blips
When a new OemPreference object is set, the requests
tracking that default will be re-created to track the
new default. This is true regardless of whether that
particular default has changed.

Because the new copied request doesn't know about the
old satisfier, the rematch code will mistakenly think
this callback didn't have a network and will send a
spurious onAvailable to it.

This patch fixes this by simply copying the satisfier
together with the rest of the NRI. The matching code
will then understand the correct previous status.

As a drive-by fix, this also fixes the annotations on
the reassignment contents that can be null. They have
more complex interactions (not everything can be null
at the same time), but the old annotations were just
putting @NonNull on nullable stuff.
In the same line, while there used to be a case with
a satisfier but no request when the satisfier is the
no-service network, there may now be a case where the
old satisfier is known but the old request isn't.

Test: FrameworksNetTests
Test: TODO : need a unit test for this
Change-Id: Ide2567b226722ea9d35ebd8205943363e27647a2
2021-03-04 13:11:59 +00:00
Chalard Jean
52d7b73c0d Fix a bug where a request would not be refcounted
This ends up crashing the system when the request
is unregistered, because the ref counter finds the
count associated with the relevant UID is zero.

Test: FrameworksNetTests
Test: TODO : this needs a new unit test
Change-Id: I0ee0ce925a826d35d8fd58cefb8a870e98ce9add
2021-03-04 22:08:09 +09:00
Chalard Jean
07dc18662a Fix a bug where UID ranges would not be removed
When a new preferences object is sent that no longer contains
a particular app, a new set of requests will be generated. All
requests corresponding to that app will be unregistered, and
no new ones will be filed since the preferences no longer
contain that app.

The place where the UID ranges are removed however is in
makeDefaultForApps(), which takes a request. As there no
longer is a default request for this app, makeDefaultForApps()
will never be called with a request for it, and the UID ranges
will never be removed.

This change applies an emergency fix with some side effects
when setting a new preference. This is acceptable, but should
ideally be fixed ; see TODO in the code for details.

Test: FrameworksNetTests
Test: TODO : Need a unit test for this
Change-Id: Iac3f55af5d00d174460e1d4cdd31f581835dbaa6
2021-03-04 22:08:09 +09: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
Remi NGUYEN VAN
3fa91ba437 Fix CaptivePortalTest before R
The last change broke the test on Q and R. Fix it to check
Q and R behavior properly, so the test can be run in presubmit
on such devices too.

Bug: 181844595
Change-Id: I99847ea30d49d690d9011d4763a7345126807119
Test: atest CtsNetTestCasesLatestSdk
2021-03-04 10:45:02 +00:00
Chiachang Wang
feecccf308 Have the DataConnectionStat started from BSS
ConnectivityService is going to becoming a mainline module.
The DataConnectionStat is used to listen the telephony status
change and report to BSS. This does not really relate to
connectivity. DataConnectionStat was created in
ConnectivityService and use some hidden APIs which is not
allowed for a mainline module. Thus, move the creation and
monitor to BSS directly which is more appropriate place from
its functional perspective.

Also, move the DataConnectionStat out from module scope since
it does have too much relationship with connectivity module.

Bug: 171183530
Test: m ; verify the behavior with cellular state change
Change-Id: I0c2c1b90df7a107ee75e81fd49d39d65678204c0
Merged-In: I0c2c1b90df7a107ee75e81fd49d39d65678204c0
2021-03-04 16:21:25 +08:00
Janis Danisevskis
535b7b557c Keystore 2.0: Make VPN Keystore 2.0 ready.
* Use public stable API to load certificates from keystore.
* Also use grants to allow racoon to use keystore keys without
  special exceptions in keystore.
* Use LegacyProfileStore instead of Keystore for storing VPN profiles.

Bug: 175068876
Bug: 171305607
Test: atest android.net.cts.Ikev2VpnTest
      atest android.net.cts.IpSecManagerTest
      atest com.android.server.connectivity.VpnTest
      atest com.android.server.ConnectivityServiceTest
Merged-In: I27975113896ea137260a9f94a34fb1c3ca173fe3
Change-Id: I27975113896ea137260a9f94a34fb1c3ca173fe3
2021-03-03 22:14:41 -08: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