Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,628 Commits 3 Branches 0 Tags
09b13e4eb7d4940c1917d40f6c6e47bf4d4e3626
Commit Graph

561628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Stack
09b13e4eb7 Merge "Move UWB Tests to CTS" am: 5467048bd0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I908c6a2845da1ce28494d8280df1857aa71de35f
 2021-02-18 19:35:12 +00:00
Treehugger Robot
31b2a11bdf Merge "Specify version for aidl_interface explicitly" am: e06165a251 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591452

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62df55dd27f0d171d00e292a05c28c87ecccfb58
 2021-02-18 19:31:53 +00:00
Nataniel Borges
956aebf3a6 Merge "Include component ID in OWNERS file" am: b333f43dec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I582209f3b6ec1fc97057215d4afe71f5ba84bf87
 2021-02-18 19:29:02 +00:00
Brian Stack
5467048bd0 Merge "Move UWB Tests to CTS" 2021-02-18 16:30:20 +00: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
093e8d266a Merge "Add proto tombstones to Dropbox." am: 3361ca6c56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590892

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I197a71c2b6ab45deedbd746408f88ff706c296e5
 2021-02-18 10:11:04 +00:00
Josh Gao
3d9f3f0076 Merge "Attach protobuf tombstones to ApplicationExitInfo." am: 2e1418c47f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc4772efd56abeae43696b78c0ec550712da8461
 2021-02-18 09:33:38 +00:00
Josh Gao
254b54464d Merge "Purge proto tombstones when apps are uninstalled." am: a139d7cbde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67177a53aba4cc0a5886da053d4db0468ed3c46a
 2021-02-18 09:30:01 +00:00
Chalard Jean
9576f318d0 Merge "Optimization when looking up requests for release" am: 29392ab01a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592999

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47310ae059b93921206dff400d35ae024e400325
 2021-02-18 09:26:16 +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
ea256c68e2 Merge "Fix merge conflict." am: 187a9a085a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacfb147645ff01c270ebeefde7ab1b9b61bafd44
 2021-02-18 06:36:08 +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
3283a2675d Merge changes I0cadd145,I3be3cac4,I9ea6e9e8 am: 4ea84f0b97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3f0b51482a8f71152380d2ecc747c9e66717e2c
 2021-02-18 03:24:10 +00: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
f08e1215d2 Merge "Add VcnUnderlyingNetworkSpecifier" am: a7d23702bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I990d82653ff47a5c99636655478765f20118ca08
 2021-02-18 03:05:15 +00:00
Benedict Wong
a7d23702bf Merge "Add VcnUnderlyingNetworkSpecifier" 2021-02-18 02:35:12 +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
2b8bf4495e Merge "media OWNERS: add MediaDrm team" am: 765297255d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfdf4931737f026126350989f3072826901efcf8
 2021-02-18 01:39:33 +00:00
Jiashen Wang
24162e1679 Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bcaf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec7ac9ff98c8ad75998bfa079da3f2b2ecd47fa5
 2021-02-18 01:36:22 +00:00
Treehugger Robot
765297255d Merge "media OWNERS: add MediaDrm team" 2021-02-18 01:35:17 +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
5bddee5dda Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4
 2021-02-17 23:17:40 +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
8f2b5071b3 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fedfbd2270ff5dac3e87e1ed83b0607a4ad2c30
 2021-02-17 21:25:35 +00:00
Yan Yan
bf8113b93d Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" 2021-02-17 21:22:57 +00:00
Hunter Knepshield
c47df2e2e9 Merge "Allow optional package names in carrier configs" am: 68612ac556 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11323dffc28c43e9463bd9f0cbcc04fad29f7a6a
 2021-02-17 21:16:18 +00:00
Yan Yan
14e64c42ad Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cda370ffe8babd62d8b7f38a09e35dd947c3384
 2021-02-17 21:10:13 +00:00
Treehugger Robot
4b06a33f7b Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d8da5f999b75a05ce45d2d2fe31e5e0fa0b792f
 2021-02-17 21:07:47 +00:00
Brad Ebinger
cd59a1a0f3 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I416fd516d93bd0505e3764fc607a2f5f13c3173e
 2021-02-17 21:04:23 +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
Shawn Willden
2da3a280d2 Merge "Add support for app-generated attestation keys." am: 50a66e39cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If460b938bbc4c10bad414abcf9965db5216eb423
 2021-02-17 19:42:22 +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
Chih-hung Hsieh
b737e334f9 Merge "Ignore tidy checks which produce warnings" am: ec9f1c6833 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e5b257249d7cec5783481f8832c429bc1206b96
 2021-02-17 18:47:29 +00:00
Treehugger Robot
34312d2173 Merge "Expose a setter for install scenarios" am: 29ec0b24c7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5c36a19600d0e8b3109185fea97834c233bac23
 2021-02-17 18:44:22 +00:00