LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,802 Commits 2 Branches 0 Tags
0658f3f717b28ab693dddbf577effac366236b6c
Commit Graph

12802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
0658f3f717 [automerger skipped] Merge "Note network interfaces based on transport" am: a7656b2d7e am: 73a7e5b4e9 am: a4f689e36d -s ours 
am skip reason: Change-Id I4e928fac8a57a9b1fc758a44af2a5719b8c871b8 with SHA-1 4768f6316e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie00f6cdf0545b325d43e8b5491ee182bc6b4035b
 2021-01-28 09:57:25 +00:00
Treehugger Robot
a4f689e36d Merge "Note network interfaces based on transport" am: a7656b2d7e am: 73a7e5b4e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444343c7230c0f947a666334fb895736fa4bc153
 2021-01-28 09:02:21 +00:00
Treehugger Robot
73a7e5b4e9 Merge "Note network interfaces based on transport" am: a7656b2d7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae2ae51e3819b37cf2c85ce12715978d6ba68c55
 2021-01-28 08:32:23 +00:00
Lorenzo Colitti
29e36cb8c8 Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b am: edd29a2f23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21c1c7913987a2bb4d486e6ce8da24a76ddf2dc6
 2021-01-28 08:06:46 +00:00
Chiachang Wang
fb61f467cf Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc am: 6d0e73ed67 am: 72f68cc2f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebc2b32fa7ed14b5326ec7649831fbc8e08b1e9d
 2021-01-28 08:06:05 +00:00
Treehugger Robot
b7ac698f9d Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 am: 59452b2ad4 am: ac4ababa1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14cc8f1f44b09c82ed9d897b904513d3ea49d558
 2021-01-28 08:05:36 +00:00
Treehugger Robot
a7656b2d7e Merge "Note network interfaces based on transport" 2021-01-28 07:45:20 +00:00
Lorenzo Colitti
edd29a2f23 Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 am: d892e45c9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I174ab03efc5291c58aa2842831ba2cd62381cf43
 2021-01-28 07:42:30 +00:00
Chiachang Wang
72f68cc2f7 Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc am: 6d0e73ed67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id15d49eb46923d3d5c0433babeceea9fec21386c
 2021-01-28 07:32:11 +00:00
Treehugger Robot
ac4ababa1b Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 am: 59452b2ad4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie90c6d0245703243f66a9bc2e4d0bf512b3e6339
 2021-01-28 07:31:49 +00:00
Lorenzo Colitti
d892e45c9b Merge "Fix legacy APIs when VPN switches to suspended underlying network." am: 83563fd735 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I385f93ef5fc3a627fcc2ae827c72e0785c464d8f
 2021-01-28 07:22:25 +00:00
Chiachang Wang
6d0e73ed67 Merge "Replace hidden getFileDescriptor$()" am: f13926d8dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553966

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f87447485fd0a4ee008bcabea80b4827fdd99b
 2021-01-28 07:15:15 +00:00
Lorenzo Colitti
83563fd735 Merge "Fix legacy APIs when VPN switches to suspended underlying network." 2021-01-28 07:07:37 +00:00
Treehugger Robot
59452b2ad4 Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae1d067d23fb87d97f326f6da29ddf3a022a821
 2021-01-28 07:04:48 +00:00
Chiachang Wang
f13926d8dc Merge "Replace hidden getFileDescriptor$()" 2021-01-28 06:36:11 +00:00
Remi NGUYEN VAN
afd7560b29 Note network interfaces based on transport 
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

Bug: 174436414
Test: atest
  atest ConnectivityServiceTest#testBatteryStatsNetworkType \
      --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
 2021-01-28 15:10:54 +09:00
Treehugger Robot
a4520fd260 Merge "[Mainline] Migrate TextUtils#emptyIfNull" 2021-01-28 06:05:08 +00:00
TreeHugger Robot
359e963945 Merge "Revert "Revert "Note network interfaces based on transport""" into sc-dev 2021-01-28 05:55:23 +00:00
Lucas Lin
6225d58df6 Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 am: a9090b57cf am: da20373654 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I743f07815b4d2d112d0f8bbeb9d313f6f3d3a8e0
 2021-01-28 05:33:07 +00:00
Lucas Lin
19a324e9bd Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048 am: b96b07febe am: 0c2e799c80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f7bafc63926c7c68c7c3cdd13069234487888fa
 2021-01-28 05:32:36 +00:00
Lucas Lin
da20373654 Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 am: a9090b57cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1631856cb2324f5295f834ce8ff2f6276d15a759
 2021-01-28 05:01:27 +00:00
Lucas Lin
0c2e799c80 Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048 am: b96b07febe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I061c38c83eedf9235d85c4353e88b72117d93b86
 2021-01-28 05:01:00 +00:00
Lucas Lin
a9090b57cf Merge "Use createStringArray instead of readStringArray" am: d1a04ba095 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38445a56180675c48055fc4256ea238c2b86fabe
 2021-01-28 04:31:18 +00:00
Lucas Lin
b96b07febe Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: d15fcc3048 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd01df52928e13717eae903c49e201f7bf39940e
 2021-01-28 04:28:10 +00:00
Lucas Lin
d1a04ba095 Merge "Use createStringArray instead of readStringArray" 2021-01-28 04:04:10 +00:00
lucaslin
cee4354c1d Use createStringArray instead of readStringArray 
To prevent ProxyInfo calling hidden API, use public one -
Parcel#createStringArray() instead.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I1a5376872d743e1863982bb95d579aeba7159d33
 2021-01-28 04:03:59 +00:00
Lucas Lin
d15fcc3048 Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" 2021-01-28 04:01:49 +00:00
Chiachang Wang
0bb339732d Replace hidden getFileDescriptor$() 
It's the preparation for the incoming ConnectivityService
mainline. The mainline modules can not access hidden APIs.
Thus, the hidden APIs usage should be removed.

The getFileDescriptor$() in Socket or DatagramSocket is
hidden for internal usage. It should be used in a module and
not prefer to expose as an API. Thus, replace it with
ParcelFileDescriptor APIs to get the fd via
ParcelFileDescriptor.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I05b31a48315e7e6d95e22123103e544a7136a449
 2021-01-28 11:33:13 +08:00
Treehugger Robot
524489652e Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33 am: 2b6868d243 am: 85c56d4826 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e6b14fca44919610317831c147413b0a431224
 2021-01-27 14:16:00 +00:00
Treehugger Robot
85c56d4826 Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33 am: 2b6868d243 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
 2021-01-27 13:57:34 +00:00
Treehugger Robot
2b6868d243 Merge "[FUI03] No-op refactoring of VpnInfo" am: c1140f2a33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
 2021-01-27 13:11:28 +00:00
Treehugger Robot
c1140f2a33 Merge "[FUI03] No-op refactoring of VpnInfo" 2021-01-27 11:47:34 +00:00
Remi NGUYEN VAN
4768f6316e Revert "Revert "Note network interfaces based on transport"" 
Instead of classifying interfaces by network type in BatteryStats,
classify them based on the transports array provided by the
NetworkAgent.

Network types are deprecated and transports should be used instead. This
change allows BatteryStats to stop depending on unstable APIs such as
isNetworkTypeMobile.

This change also updates nullability annotations in ConnectivityService
and NetworkAgentInfo to show that the NetworkCapabilities are non-null
(as provided by the network agent) when calling
noteNetworkInterfaceTransports.

This is rolling forward a previously reverted change. The new change
also fixes MobileRadioPowerCalculatorTest that was broken when
submitting the previous change.

Bug: 174436414
Test: atest
      atest ConnectivityServiceTest#testBatteryStatsNetworkType \
          --rerun-until-failure 40

Merged-In: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8

Change-Id: I4e928fac8a57a9b1fc758a44af2a5719b8c871b8
(cherry picked from commit 2d17d202bc709c205506c03149d847f00f92d78d)
 2021-01-27 09:02:22 +00:00
Remi NGUYEN VAN
f773ee85d1 Merge "Move connectivity-sources to frameworks/base" am: 82a30b6bbe am: 71bcb81640 am: 0f98098600 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9ccdcbd727ab8573aadeb5b7c8a9eb0569acac4
 2021-01-27 08:49:37 +00:00
Remi NGUYEN VAN
0f98098600 Merge "Move connectivity-sources to frameworks/base" am: 82a30b6bbe am: 71bcb81640 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I086ea4d13012e89a9ab9c006107fc24cbcb33db9
 2021-01-27 08:27:55 +00:00
James Mattis
544ae6e8fa Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898 am: f07220e8f5 am: 7a7e2bb6a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79c5b8919396827d281fcd04dced649847e9a038
 2021-01-27 08:05:27 +00:00
Chiachang Wang
e5648441c4 Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e am: c1e552c667 am: 669715a9c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc0ac9def6a0a05658235b61f36ef8829906c341
 2021-01-27 08:04:37 +00:00
Paul Hu
79ad2808b9 Merge "Fix FrameworksNetIntegrationTests failure" am: 4071a8ccb1 am: 438f45fc13 am: b24091856f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559105

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a8b00c2f1b2d809e0aa3aa9f5a5cee58480fccd
 2021-01-27 08:01:10 +00:00
Paul Hu
9a56d89a0b Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: d07d47e255 am: c8341e807d am: 45a771a50f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02ff8df90f86e25c8845301e11f351407bee0178
 2021-01-27 08:01:01 +00:00
Treehugger Robot
6d457c9156 Merge changes I713bc2ec,Ib9ab07c9 am: c5a7a59483 am: efeaa56ba6 am: 8b8a8fc5de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b291a4e82b89d3808e9bcd980d5b2aa4d2b1b71
 2021-01-27 07:53:30 +00:00
Remi NGUYEN VAN
71bcb81640 Merge "Move connectivity-sources to frameworks/base" am: 82a30b6bbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552065

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5839df398fe834f527c2ed4732220592be1762ab
 2021-01-27 07:50:14 +00:00
lucaslin
61ad5f342e Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier 
To prevent mainline module related file to access a hidden API,
check whether the NetworkSpecifier is an instance of
MatchAllNetworkSpecifier by itself.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I4d49cb70ff3c8a7e1ffa32e38207c74a6375e51a
 2021-01-27 15:32:43 +08:00
Remi NGUYEN VAN
82a30b6bbe Merge "Move connectivity-sources to frameworks/base" 2021-01-27 07:15:05 +00:00
junyulai
bd7f3cd75b [FUI03] No-op refactoring of VpnInfo 
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
 2021-01-27 15:03:06 +08:00
James Mattis
7a7e2bb6a1 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898 am: f07220e8f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If95476bce2e340fb95a64f314ba0fef420f14294
 2021-01-27 05:45:23 +00:00
James Mattis
f07220e8f5 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 4c69988898 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88af6ecc2d8cb7695029504b842e08d622f3d2ed
 2021-01-27 05:33:07 +00:00
James Mattis
4c69988898 Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 
* changes:
  Updates to handler logic for multilayer requests
  Update to sendAllRequestsToProvider for Multilayer
  Multilayer request updates to request callbacks
  Multilayer support when NAI requests are updated
 2021-01-27 04:50:43 +00:00
Chiachang Wang
669715a9c5 Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e am: c1e552c667 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4415671e964346ea31844d0a7ed65459ffe338b2
 2021-01-27 03:38:00 +00:00
Chiachang Wang
c1e552c667 Merge "Update jni to get int descriptor in native layer" am: 332aae3a6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd8dbb868577eb071f950c7e9afb25b929e9441c
 2021-01-27 03:10:44 +00:00
James Mattis
08131f3446 Updates to handler logic for multilayer requests 
Updates to ConnectivityService network request handler's logic to support
(or disallow support of) multilayer network requests.

Bug: 175239920
Bug: 171991028
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: Ic67cff950d72745d6508a0a037bd33f932d5132c
 2021-01-26 18:44:45 -08:00