Commit Graph

560764 Commits

Author SHA1 Message Date
Lorenzo Colitti
6c77e14663 Merge "Fix all Log.wtfs in FrameworksNetTests." 2021-02-19 07:49:27 +00:00
Treehugger Robot
394170f9cc Merge "Use formal API for ActivityThread to set proxy" 2021-02-19 05:42:06 +00:00
Josh Gao
ecc474af3b Merge "NativeTombstoneManager: catch ProtoParseException." 2021-02-19 05:02:16 +00:00
Remi NGUYEN VAN
72887073f2 Use formal API for ActivityThread to set proxy
Add setHttpProxyConfiguration to the public API, and use
ConnectivityManager APIs from ActivityThread (instead of hidden APIs) to
get/set the proxy for an app process.

The default proxy is now initialized with getDefaultProxy instead of
getProxyForNetwork(null); this should not make a difference, as nothing
should have called bindProcessToNetwork at that point yet.

Bug: 174436414
Test: m; device boots
Merged-In: Ifb516194ecde1567cea4b6806946091cdcf2f015

Change-Id: I06b797eeae54609aecdc0afe1df4e6c602a17a69
2021-02-19 13:53:56 +09:00
Remi NGUYEN VAN
09bbad130d Merge "Split parcelable .aidl files to aidl-export" 2021-02-19 02:21:25 +00:00
Treehugger Robot
41663a0eb6 Merge "Fix OverlayDeviceTests for un-rooted devices" 2021-02-19 01:12:21 +00:00
Ryan Mitchell
de8d74fb77 Fix OverlayDeviceTests for un-rooted devices
The AndroidText.xml needs the root preparer to run on non-rooted
devices.

Bug: 177115481
Bug: 180623619
Test: adb unroot && atest OverlayDeviceTests
Change-Id: I4377207428182fbb76c09abef248b69eeae6acf5
Merged-In: I4377207428182fbb76c09abef248b69eeae6acf5
2021-02-18 23:56:24 +00:00
Yan Yan
bf16b6d399 Merge "API: Expose VcnControlPlaneConfig" 2021-02-18 23:00:56 +00:00
Josh Gao
2b67941ffe NativeTombstoneManager: catch ProtoParseException.
If we can't parse the proto for some reason, don't nuke system_server.

Bug: http://b/159164105
Test: `adb shell crasher` on sc-vf-dev
Change-Id: Id8af5f41177d68dacfd9da69eddea4d88d62f420
2021-02-18 14:20:42 -08:00
Primiano Tucci
355753053c Merge "Do not check for debuggable / profilable for app tracing." 2021-02-18 17:52:31 +00:00
Brian Stack
494aad3c8d Merge "Update UWB OWNERS" 2021-02-18 16:31:59 +00:00
Brian Stack
5467048bd0 Merge "Move UWB Tests to CTS" 2021-02-18 16:30:20 +00:00
Lorenzo Colitti
fd490bff45 Fix all Log.wtfs in FrameworksNetTests.
These cause the tests to crash on eng builds, so disrupt
development.

Test: atest FrameworksNetTests passes on eng build
Change-Id: Ifa5131fdb8f57af812cf688970be6588d2879c29
2021-02-18 21:13:04 +09:00
Treehugger Robot
e06165a251 Merge "Specify version for aidl_interface explicitly" 2021-02-18 10:56:30 +00:00
Nataniel Borges
b333f43dec Merge "Include component ID in OWNERS file" 2021-02-18 10:36:56 +00:00
Josh Gao
3361ca6c56 Merge "Add proto tombstones to Dropbox." 2021-02-18 08:41:55 +00:00
Josh Gao
2e1418c47f Merge "Attach protobuf tombstones to ApplicationExitInfo." 2021-02-18 08:40:57 +00:00
Josh Gao
a139d7cbde Merge "Purge proto tombstones when apps are uninstalled." 2021-02-18 08:39:24 +00:00
Chalard Jean
29392ab01a Merge "Optimization when looking up requests for release" 2021-02-18 08:33:09 +00:00
Lorenzo Colitti
187a9a085a Merge "Fix merge conflict." 2021-02-18 05:22:56 +00:00
James Mattis
14464a126f Optimization when looking up requests for release
Including an optimzation in handleReleaseNetworkRequest when
looking up a request so that in the chance an app shuts down prior to
the request being released, it doesn't cause errors when looking
validating that apps uid->package name.

Bug: 178729499
Test: atest FrameworksNetTests
atest ExtServicesUnitTests on CF and making sure no remote exceptions.

Change-Id: I2c49511a1385b47fba075b2794685ae2bc80abba
2021-02-17 19:34:43 -08:00
Cody Kesting
4ea84f0b97 Merge changes I0cadd145,I3be3cac4,I9ea6e9e8
* changes:
  Correct comment for safe mode alarm in VcnGatewayConnection.
  Implement VCN error callback use.
  Define VcnStatusCallback#onGatewayConnectionError callback.
2021-02-18 03:07:14 +00:00
Benedict Wong
a7d23702bf Merge "Add VcnUnderlyingNetworkSpecifier" 2021-02-18 02:35:12 +00:00
Yan Yan
afc550f30b API: Expose VcnControlPlaneConfig
Each VcnGatewayConnectionConfig must have a VcnControlPlaneConfig
that contains all connection, authentication and authorization
parameters required to establish a gateway connection.

Bug: 163604823
Test: make update-api && make
Change-Id: If4a58e7b0391b485ee7c4482d422bec5e6ba4148
2021-02-18 02:26:27 +00:00
Josh Gao
f4c51f3771 Add proto tombstones to Dropbox.
Bug: http://b/159164105
Test: treehugger
Change-Id: I9f14482f693c9645d72a93d4a966909bf797533a
2021-02-17 17:40:49 -08:00
Josh Gao
c36f532d91 Attach protobuf tombstones to ApplicationExitInfo.
Bug: http://b/159164105
Test: atest CtsAppExitTestCases
Change-Id: I377247e8fc85f917676cb57eaa3128b955634fa5
2021-02-17 17:40:49 -08:00
Treehugger Robot
765297255d Merge "media OWNERS: add MediaDrm team" 2021-02-18 01:35:17 +00:00
Remi NGUYEN VAN
4e8639649a Split parcelable .aidl files to aidl-export
The one-line "parcelable X" files need to be imported by targets that do
not build against SDK (the SDK has prebuilt definitions), so prepare a
dedicated directory for them.
This avoids having users of the classes include the whole src/
directory, which could contain definitions for classes that are not part
of the public API, so should not be imported.

Also move back to frameworks/base/core some .aidl definitions that
were separated from their associated class.

Bug: 171540887
Test: m
Merged-In: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
Change-Id: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
2021-02-18 01:17:04 +00:00
Jiashen Wang
822856bcaf Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" 2021-02-18 01:04:29 +00:00
Rubin Xu
5eeae4c716 Merge "Add KeyChain Test API for the credential manager" 2021-02-17 22:47:20 +00:00
Cody Kesting
b79add4584 Correct comment for safe mode alarm in VcnGatewayConnection.
Bug: 178140973
Test: atest FrameworksVcnTests
Change-Id: I0cadd145fe41f5589fb79725a4370aed527927a0
2021-02-17 14:28:34 -08:00
Cody Kesting
a65c2d8ad1 Implement VCN error callback use.
This CL updates VcnGatewayConnection to notify VcnManagementService
(through Vcn) when errors occur with a gateway. VcnManagementService
then notifies registered, permissioned VcnStatusCallbacks via

Bug: 163433613
Test: atest FrameworksVcnTests
Change-Id: I3be3cac4b591b19a0b0075767fde0ba2eb6e12a2
2021-02-17 14:28:34 -08:00
Cody Kesting
fe0523949b Define VcnStatusCallback#onGatewayConnectionError callback.
This CL updates VcnStatusCallback to have a onGatewayConnctionError()
function. This function will be used to notify callers when Gateway
Connection errors occur, such as authentication failures or the session
unexpectedly dying.

Bug: 163433613
Test: atest FrameworksVcnTests
Change-Id: I9ea6e9e850eb9d8b0d374c5447895f1f04121696
2021-02-17 14:28:33 -08:00
Jiashen Wang
6851cf0c51 Add the immutable flag to EuiccManager calls in RecoverySystem
Bug: 170432460
Test: refactoring CL. Existing unit tests still pass
Change-Id: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42
Merged-In: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42
2021-02-17 22:04:23 +00:00
Yan Yan
bf8113b93d Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" 2021-02-17 21:22:57 +00:00
Hunter Knepshield
68612ac556 Merge "Allow optional package names in carrier configs" 2021-02-17 20:58:27 +00:00
Yan Yan
a931d4516d Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" 2021-02-17 20:40:44 +00:00
Treehugger Robot
3ad85e407e Merge "pm: Require manifest.json for .dm (dex-metadata) files." 2021-02-17 20:36:43 +00:00
Igor Murashkin
abe2776ddf pm: Require manifest.json for .dm (dex-metadata) files.
Example file:
  $> unzip CtsApkVerityTestAppPrebuilt.dm manifest.json ; cat manifest.json
  {
    "packageName": "android.appsecurity.cts.apkveritytestapp",
    "versionCode": 30
  }
  
Cherry-picked from 12af11d6f5

Test: adb install-multiple -r foo.apk foo.dm
Test: atest FrameworksServicesTests:com.android.server.pm.dex.DexMetadataHelperTest
Bug: 179295368
Merged-In: I7a3c442bb27da5948bc9ead146c77213de6b56cc
Change-Id: I7a3c442bb27da5948bc9ead146c77213de6b56cc
2021-02-17 20:34:17 +00:00
Brad Ebinger
c7baa4862f Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" 2021-02-17 20:27:18 +00:00
Yan Yan
a9c1bab850 Store VcnControlPlaneConfig in VcnGatewayConnectionConfig
This CL requires callers to set a VcnControlPlaneConfig for
building VcnGatewayConnectionConfig

Bug: 163604823
Test: FrameworksVcnTests (new tests added)
Change-Id: If45cb2aa866d627f3bb9762309fe8b07bf729ba8
2021-02-17 11:25:04 -08:00
Shawn Willden
50a66e39cd Merge "Add support for app-generated attestation keys." 2021-02-17 19:12:20 +00:00
Yan Yan
c4fbd6a90c Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig
VcnControlPlaneConfig contains control plane configuration for
a VCN gateway connection. VcnControlPlaneIkeConfig is a
subclass that contains IKE configuration.

The followup CL will store VcnControlPlaneConfig in
VcnGatewayConnectionConfig.

Bug: 163604823
Test: FrameworksVcnTests(new tests added)
Change-Id: If7a85ae44e77fc4477b56ffa50c6e99ee96132d0
2021-02-17 10:56:48 -08:00
Brian Stack
be1df1fed9 Update UWB OWNERS
Bug: 180514254
Test: N/A
Change-Id: I5998d024976ce4c171421a0c84d951914ccd5403
2021-02-17 10:42:54 -08:00
Chih-hung Hsieh
ec9f1c6833 Merge "Ignore tidy checks which produce warnings" 2021-02-17 18:34:48 +00:00
James.cf Lin
603c23178a [RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism
Expose OPTIONS portion of capability exchange APIs.

Bug: 174166957
Test: atest CtsTelephonyTestCases
Change-Id: I21277fce055f31400f2018b6f81102225cb7c7c8
2021-02-17 18:17:35 +00:00
Treehugger Robot
29ec0b24c7 Merge "Expose a setter for install scenarios" 2021-02-17 18:17:09 +00:00
Cody Kesting
f1d78f17c2 Merge changes I3242ad0e,I5daced20,Iefd284ae
* changes:
  Notify status callbacks when a VCN enters Safemode.
  Change all 'safemode' references to use 'safe mode'.
  Define VcnStatusCallback register/unregister.
2021-02-17 18:08:48 +00:00
Benedict Wong
54e89ebf18 Merge "Expose Basic VCN API surface" 2021-02-17 18:03:08 +00:00
Colin Cross
334917b860 Merge "Fix self-assign error in SimPhonebookContract" 2021-02-17 17:43:15 +00:00