Commit graph

13,045 commits

Message SHA1
Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: Id012600c0f06b25c90598543a20673e6f515bf29

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-16 09:05:38 +00:00
dc6444c414
Merge "Have a new API to get private DNS mode" am: 11a286c9b5 am: eafa4097bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I5441212823663f02d20cecfbfdba126c8ed6e0de

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-16 08:46:31 +00:00
9ecf4d330b
Merge "Add comments to describe the value of converting hex to decimal"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-16 08:31:10 +00:00
26f778d2bd
Merge "Have a new API to get private DNS mode" am: 11a286c9b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I2600965b38f3039c0cca1c39d294ad9665aeab17

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-16 08:06:35 +00:00
eafa4097bd
Merge "Have a new API to get private DNS mode"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-16 07:39:35 +00:00
11a286c9b5
Merge "[NS01] Add NetworkScore" am: 98de10a7a1 am: 18294fcbb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I3fede24f8b38222d259f42e86ac27962ca687fb4

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-03-16 07:08:25 +00:00
a73e64726f
Merge "Add ParseException constructors to API" am: ef7b38b334 am: 2299e83d12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: If6c7a232857a801ea5872c3beeba90d426a72d5a

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-16 07:08:04 +00:00
40078d1567
Remove usage of networkAttributes
networkAttributes is a legacy configuration that is now only used to
configure which legacy type networks are supported, and what the restore
timer is for that network type, for the deprecated
startUsingNetworkFeature API.

Use a dedicated resource for the restore timers, and build supported
legacy network types using hasSystemFeature for wifi, wifi p2p,
bluetooth, proxy types, and TelephonyManager.isDataCapable for the
mobile types.

Bug: 146206136
Test: atest FrameworksNetTests
Change-Id: I3a771d3de6c5e912f18d2834e3a50af797ac4991

Remi NGUYEN VAN   commited 2021-03-16 16:01:40 +09:00
9f9922813f
Merge "[NS01] Add NetworkScore" am: 98de10a7a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I71f1937ffd099283d7f753b843d4cf2a771fe22b

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-03-16 06:53:52 +00:00
18294fcbb3
Merge "Add ParseException constructors to API" am: ef7b38b334
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: I2eca0681d3a94da26307663d56975327bbd06c6a

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-16 06:49:08 +00:00
2299e83d12
Merge "[NS01] Add NetworkScore"
Chalard Jean   authored and   Gerrit Code Review   commited 2021-03-16 06:36:07 +00:00
98de10a7a1
Merge "Add ParseException constructors to API"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-16 06:25:16 +00:00
ef7b38b334
Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871

Change-Id: Ia7855ef7125726ecec0c4509b5026aeb5621cd3d

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-16 03:50:47 +00:00
19e5014a61
Merge "Create ServiceConnectivityResources" am: eb46aa1c58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871

Change-Id: I91fb801ef2edf64fcaaf082f57eaadb3e7612efa

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-16 03:11:25 +00:00
4df498eb9a
Merge "Create ServiceConnectivityResources"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-16 02:29:31 +00:00
eb46aa1c58
Replace interal okhttp APIs
Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
internal okhttp APIs to stable libcore APIs which are created for
using HttpURLConnectionFactory.

Bug: 182238821
Test: atest FrameworksNetTests
Change-Id: I56ba1b9e6e94f9c6519c3f1c8f0c5993fccbe185

paulhu   commited 2021-03-15 23:06:15 +08:00
e5852fbc9a
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6edda160620b4a3cbcf85f21081a41d959cf3173

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-15 14:24:34 +00:00
35667ce499
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0ca67f38da9d4a70911485d2630fe8bae4cbdfa

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-15 13:48:39 +00:00
3e0314d68f
Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-03-15 13:09:14 +00:00
85bea4887f
Merge changes from topic "pacproxy-service" am: 267bebc6a9 am: de062690cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-03-15 12:30:17 +00:00
2b89f2ae7f
Merge changes from topic "pacproxy-service" am: 267bebc6a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29e9e324f25e584d645900f83d31a00a4e151cbb

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-03-15 12:12:48 +00:00
de062690cc
Merge changes from topic "jni-errno-exception" am: 685a40571c am: d43926c07a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4106aed41c8e00a27fa8fb6dbc4dba5ac08d6c2

Sorin Basca   authored and   Automerger Merge Worker   commited 2021-03-15 12:12:35 +00:00
5d1f25b158
Merge changes from topic "pacproxy-service"
* changes:
  Make PacProxyService be a system service
  Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"

Aaron Huang   authored and   Gerrit Code Review   commited 2021-03-15 11:49:45 +00:00
267bebc6a9
Merge changes from topic "jni-errno-exception" am: 685a40571c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619421

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If704b8e72e74f0e1afcfc59d5ad03c3003e2643a

Sorin Basca   authored and   Automerger Merge Worker   commited 2021-03-15 11:34:48 +00:00
d43926c07a
Merge changes from topic "jni-errno-exception"
* changes:
  Using jniThrowErrnoException in android_util_Process
  Using jniThrowErrnoException in android_os_SharedMemory
  Using jniThrowErrnoException in android_net_NetworkUtils

Sorin Basca   authored and   Gerrit Code Review   commited 2021-03-15 11:16:14 +00:00
685a40571c
Add comments to describe the value of converting hex to decimal
Bug: 172183305
Test: N/A
Change-Id: Id274295d6c8c97d3014214f875168ff968f79bb6

lucaslin   authored and   Lucas Lin   commited 2021-03-15 09:55:39 +00:00
286330701c
[NS01] Add NetworkScore
As attested by numerous TODOs in the code, a new way of
representing network quality and policy is needed instead
of an int.

An int representing the quality of the network requires
all parties using it to know how all other parties are
using it, and implementation details about the decision
algorithm. For all intents and purposes, the selection
is left to individual network factories who try to
achieve a desired result while piecing together all
possible states of the system.

As the number of such cases and desires increases, this
becomes both intractable and unmaintainable. Indeed, at
this time in the codebase nobody can really predict exactly
how a given change in score will affect selection across
the board, and it is essentially impossible to figure out
the behavior of network selection by inspecting the code
because the moving parts are scattered throughout the
entire codebase.

Having an object encapsulating policy and quality values
will let us centralize the selection and make it again
possible to maintain without knowledge of all behaviors
of all network factories. It will also provide better
guarantees of respecting policy, and allow bugfixes that
were not possible before because they'd touch too many
parts of the code.

Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I3185a6412b9b659798faf0c6882699e9c63cc115

Chalard Jean   commited 2021-03-15 09:49:47 +00:00
dd75352682
Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b am: 44d34df483
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bd903cd723f0c3d87ac9d2aae14a95132e7a2ea

Frank Li   authored and   Automerger Merge Worker   commited 2021-03-15 09:18:29 +00:00
7e3ba1577f
Merge "[CS15]Do not use hidden API of PlatformProperties" am: b9db86ff3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I623fd33e756f9ada6b73f716a30778fd6236f6ae

Frank Li   authored and   Automerger Merge Worker   commited 2021-03-15 08:42:02 +00:00
44d34df483
Merge "[CS15]Do not use hidden API of PlatformProperties"
Frank Li   authored and   Gerrit Code Review   commited 2021-03-15 08:01:26 +00:00
b9db86ff3b
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5 am: 46adcba662
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I396e8936cf8adc0c46555a3ef5d7771d3a268594

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 08:01:03 +00:00
d38a017b28
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6 am: 23be8da17e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f14d0196b3c641108b1e82def2998d2744cb855

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-15 07:44:28 +00:00
174ffe652c
Merge "Revert "Remove connectivity dependency on Preconditions"" am: c407499db5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7dbcb1e49162210b44bd0cf2204b853c34bb5871

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 07:44:21 +00:00
46adcba662
Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a am: b8c6c46986
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I462f0d97bf150af7f32238e15e88d34e4c17eed7

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 07:44:12 +00:00
3ddc646220
Merge "Revert "Remove connectivity dependency on Preconditions""
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-15 07:30:20 +00:00
c407499db5
Revert "Remove connectivity dependency on Preconditions"
This reverts commit 1c17c88002.

Reason for revert: Build broken: b/182721112

Change-Id: Ibc84ec6d7900fdcf0bc14cd7036f9c08287711db

Remi NGUYEN VAN   commited 2021-03-15 07:27:44 +00:00
00c531f4e0
Merge "Replace InetAddress#parseNumericAddress" am: 67503fefc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f1112eef6086798a6f089dde2f297828c0b4f2e

Paul Hu   authored and   Automerger Merge Worker   commited 2021-03-15 07:06:12 +00:00
23be8da17e
Merge "Replace InetAddress#parseNumericAddress"
Paul Hu   authored and   Gerrit Code Review   commited 2021-03-15 07:03:46 +00:00
67503fefc6
Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c0c2572ff84a2b163fb2e4e0f3e2cfec043313d

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 07:03:36 +00:00
b8c6c46986
Make PacProxyService be a system service
PacProxyInstaller class is running a thread all the time and is
listening to intent ACTION_PAC_REFRESH so it would be better to
make it be a system service with a manager class PacProxyManager
which is obtained with getSystemService(PacProxyManager.class).
Besides, rename PacProxyInstaller to PacProxyService will
be easier to know it's the service for PacProxyManager.

ConnectivityService is going to be a mainline module and it
needs constructor of PacProxyService to be SystemApi.
However, in current design, it needs to pass a handler and
an int arguments to the constructor which would be difficult
to maintain if just expose the constructor directly.

So, define a listener for the event that the current PAC
proxy has been installed so that the handler and the int
arguments can be removed from the constructor.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I2abff75ec59a17628ef006aad348c53fadbed076

Aaron Huang   commited 2021-03-15 14:40:58 +08:00
b2ad4a95ba
Merge "Remove connectivity dependency on Preconditions"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-15 06:36:15 +00:00
83c34e272a
[CS15]Do not use hidden API of PlatformProperties
ConnectivityService is going to become a mainline module, and
it will not able to use hidden method anymore. Using PlatformProperties
as a static library instead of hidden API.

Bug: 170917042
Test: atest FrameworksNetTests
Merged-In: I3a3deca5d2e0f690db8c0061de2db2217376d268
Change-Id: I3a3deca5d2e0f690db8c0061de2db2217376d268

lifr   commited 2021-03-15 14:14:18 +08:00
51b9799737
Ensure all calls to getCallingUid use the version in mDeps.
There are a few calls in ConnectivityService that use the static
Binder.getCallingUid or even just getCallingUid inherited from
Binder. Fix all these to be mDeps.getCallingUid.

Test: m
Bug: 165835257
Change-Id: I0986b5272b3d40baeae3537d0d623f1150f27cdb

Lorenzo Colitti   commited 2021-03-15 15:03:05 +09:00
e085709357
Call clearCallingIdentity when calling registerNetworkProvider in TNS
The caller to create a TestNetworkService via
ConnectivityManager#startOrGetTestNetworkManager should have
passed the MANAGE_TEST_NETWORKS permission check and the caller
doesn't need to declare the permission to pass the permission
check of registerNetworkProvider. So call clearCallingIdentity
when calling registerNetworkProvider in TestNetworkService.

Bug: 181573283
Test: atest CtsNetTestCases:ConnectivityManagerTest#testRequestBackgroundNetwork
Change-Id: Ia28627dacf933d1937978ed9709b975c9a4660ce

lucaslin   authored and   Lucas Lin   commited 2021-03-15 03:29:29 +00:00
b0228dae26
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a am: b13973838a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f83eb73ce787fd8d8c577deeaced9e6a8d1a117

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 02:49:11 +00:00
231fb3a246
Merge "Create a service-connectivity-pre-jarjar library" am: 1e976dd3af am: 64f37fc02d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic63433f13a6ae28880cfaeb6cfd8b61b059562e0

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 02:48:59 +00:00
5c11659c62
Merge "Remove VpnType usage in VpnTransportInfo" am: e7ea40527a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41431bfba97a6fe0678b9a5dc72b19479d5d4c66

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 02:07:39 +00:00
b13973838a
Merge "Create a service-connectivity-pre-jarjar library" am: 1e976dd3af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17ca508f3da731404306d6e65e9743120a7e0860

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-15 02:05:41 +00:00
64f37fc02d
Merge "Remove VpnType usage in VpnTransportInfo"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-15 01:52:30 +00:00
e7ea40527a
Merge "Create a service-connectivity-pre-jarjar library"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-15 01:32:47 +00:00
1e976dd3af