LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,482 Commits 2 Branches 0 Tags
52871db64d3660214be797a40b3ca08c91cc06d5
Commit Graph

13482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
52871db64d Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b am: 42b8c94fae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cdd1dfce5a162c6e630bc6c95d99a08ff7f0169
 2021-03-05 05:22:29 +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
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
James Mattis
5e59b246a9 Merge "Unit test automation for Multi-Default Tracking" into sc-dev 2021-03-05 03:01:40 +00:00
Treehugger Robot
73e63132a6 Merge "Fix CaptivePortalTest before R" 2021-03-05 02:28:55 +00:00
Chiachang Wang
88da6662e4 Merge "Have the DataConnectionStat started from BSS" into sc-dev 2021-03-05 00:29:54 +00:00
James Mattis
b4c62b8862 Unit test automation for Multi-Default Tracking 
Unit test automation validating how multiple default networks are
tracked within ConnectivityService when set by network preferences
used with setOemNetworkPreference() API functionality.

Bug: 178632672
Bug: 172347841
Bug: 170068946
Test: atest FrameworksNetTests
Change-Id: Iae1935944214efaa8a21636c55e6d8be816275f7
Merged-In: Iae1935944214efaa8a21636c55e6d8be816275f7
 2021-03-04 13:13:48 -08:00
Chalard Jean
fa970594c3 Merge changes Ide2567b2,I0ee0ce92,Iac3f55af am: f0717a9ffe am: 2a22bdeec6 am: e585766e12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffc8bf72312391e1d54c302d31b5b3cb25d1875e
 2021-03-04 14:51:29 +00:00
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
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
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
0e9d1fe100 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
(cherry picked from commit 39c303a839e37e143a2e9145e81fe506a6c3a920)
 2021-03-04 08:08:48 +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