Commit Graph

567225 Commits

Author SHA1 Message Date
Treehugger Robot
8b159b455f Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680905

Change-Id: I100470cc936fca8dba86a1ad083d4d67139b6aea
2021-04-20 09:06:31 +00:00
Treehugger Robot
e063867f7b Merge "Update TEST_MAPPING imports for connectivity" 2021-04-20 08:45:19 +00:00
Ken Chen
a96493b7a5 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" am: 1b06ec2530
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675632

Change-Id: I5ec3328b8bd782bfc184bcbddc7572671e826cbe
2021-04-20 07:38:50 +00:00
Ken Chen
1b06ec2530 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" 2021-04-20 07:12:33 +00:00
Remi NGUYEN VAN
52c46df5d9 Update TEST_MAPPING imports for connectivity
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.

Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
2021-04-20 07:10:41 +00:00
Treehugger Robot
da5eb08ae3 Merge "Set a floor value for BLE Batch Scan report delay of 5000ms" am: ce2a2c80dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676810

Change-Id: If77fb0d86606fcc8a9b6c8a6b7f95c7990b7a9a2
2021-04-20 03:07:55 +00:00
Treehugger Robot
ce2a2c80dd Merge "Set a floor value for BLE Batch Scan report delay of 5000ms" 2021-04-20 02:27:23 +00:00
Rahul Sabnis
ea303904fd Set a floor value for BLE Batch Scan report delay of 5000ms
Tag: #feature
Bug: 167340030
Test: Manual
Change-Id: I4ef99a9562f1447a2ccee42a344384a38a487c19
2021-04-19 17:29:02 -07:00
Tianjie Xu
fa83bba5bf Merge "Revisit the lifetime of the RebootEscrowProvider" am: d746cc814f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678645

Change-Id: I0c1c67e28ee46c7647c9ca07099f5476ed5c0877
2021-04-19 23:12:02 +00:00
Tianjie Xu
894b984747 Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a1109
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673754

Change-Id: I56f15a90d5c136873e29d733d3f57d89a498bdcb
2021-04-19 23:08:20 +00:00
Tianjie Xu
d746cc814f Merge "Revisit the lifetime of the RebootEscrowProvider" 2021-04-19 23:02:01 +00:00
Tianjie Xu
f58b4a1109 Merge "Addresses TODO in ResumeOnRebootService Javadoc" 2021-04-19 23:01:55 +00:00
Hans Boehm
7644e0c5b7 Merge "Don't fork USAPs with open argument buffer" am: 6c61c65f19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651247

Change-Id: I7c9f2568a59670fb6f067b322b6fdd2d9fa34167
2021-04-19 22:58:08 +00:00
Hans Boehm
6c61c65f19 Merge "Don't fork USAPs with open argument buffer" 2021-04-19 22:33:21 +00:00
Sarah Chin
3c6d7d7dc6 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efba5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663446

Change-Id: I7bd37f0acb7f939b9fc0311ac0365be3e8587823
2021-04-19 20:43:48 +00:00
Sarah Chin
958f9efba5 Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" 2021-04-19 20:29:09 +00:00
Jing Ji
a61b23b89e Merge "Update Kotlin sample code for CountDownTimer and Parcelable" am: 598675abef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673235

Change-Id: Ia6c7d8965190b905b393d0d51fcaac2f651ef8fb
2021-04-19 19:28:23 +00:00
Treehugger Robot
ce819de5b1 Merge "Hide RCS PUBLISH mapping due to complicated structure" am: f7cde977db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675739

Change-Id: I7303f9c6d69e3aa6a515273b36bcec8f50289027
2021-04-19 19:25:32 +00:00
Jing Ji
598675abef Merge "Update Kotlin sample code for CountDownTimer and Parcelable" 2021-04-19 19:23:06 +00:00
Treehugger Robot
f03f48dae6 Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" am: ca53d40161
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675738

Change-Id: I9a4462d90bcfc6bc202e72120cfc56693139bbf9
2021-04-19 19:20:57 +00:00
Treehugger Robot
f7cde977db Merge "Hide RCS PUBLISH mapping due to complicated structure" 2021-04-19 19:09:22 +00:00
Treehugger Robot
ca53d40161 Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" 2021-04-19 19:08:51 +00:00
Steven Moreland
66f91640b9 Merge "reflect libbinder->libpermission: appops" am: 12d2d7fd9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674207

Change-Id: Idf5634a8b157dba1ffd6ebe5fb748b4a727669b4
2021-04-19 19:03:27 +00:00
Yan Yan
cc0c3a5f62 Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: Ia1a32d6dd831b5debe134681ed0760c79aad6555
2021-04-19 18:58:04 +00:00
Aurimas Liutikas
8b19886f9b Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." am: 6dd6c5a603
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660342

Change-Id: Iebe3879874d0648771e0787f3e4f265f7ba925d6
2021-04-19 18:52:57 +00:00
Sally Yuen
6f15edb618 Merge "Add UiAutomation shell permission tests to Shell presubmit tests" am: afbb23d1d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677306

Change-Id: I35c9a9af4a35dda4246b51ba25b07e34f80e7b9b
2021-04-19 18:45:32 +00:00
Hans Boehm
fab68e1481 Don't fork USAPs with open argument buffer
Delay execution of any zygote command that may end up forking USAPs
until we've released our own ZygoteCommandBuffer. Otherwise we fork
the child with an open ZygoteCommandBuffer, preventing it from
opening its own.

Bug: 182084594
Test: Build and boot AOSP, with USAPs enabled and disabled.
Change-Id: I2366367d2155a120092fbdcae13cbb3d7f4e1d16
2021-04-19 11:42:15 -07:00
Steven Moreland
12d2d7fd9c Merge "reflect libbinder->libpermission: appops" 2021-04-19 17:20:21 +00:00
Yan Yan
3022c5437c Merge "Use #setNetwork and #getNetwork for IkeSessionParams" 2021-04-19 17:04:25 +00:00
Aurimas Liutikas
6dd6c5a603 Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." 2021-04-19 16:52:58 +00:00
Sally Yuen
afbb23d1d3 Merge "Add UiAutomation shell permission tests to Shell presubmit tests" 2021-04-19 16:14:01 +00:00
Treehugger Robot
59cb50e06a Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 6e7f16ac1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676434

Change-Id: I09f86f2409cfdd3299fa453b1059fed490d623bd
2021-04-19 10:10:46 +00:00
Treehugger Robot
6e7f16ac1e Merge "CEC: Drop TODOs marked as fixed/obsolete" 2021-04-19 09:46:37 +00:00
Treehugger Robot
591ae1c7b4 Merge "Add missing synchronized(mLock) into Autofill onServiceDied" am: 5e7d4961e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607953

Change-Id: I103e6a0ca533ffbc84fed21307e96a86931447a2
2021-04-19 09:20:16 +00:00
Treehugger Robot
5e7d4961e6 Merge "Add missing synchronized(mLock) into Autofill onServiceDied" 2021-04-19 08:58:17 +00:00
v-qianliguo
60db8208a8 Add missing synchronized(mLock) into Autofill onServiceDied
Test: N/A
Signed-off-by: v-qianliguo <v-qianliguo@xiaomi.com>
Merged-In: Ic16ed5e4ac507f02e56f9e9cd94d4b4cfb028d69
Change-Id: I5c9640ab0695386effdbaaad7b72e143668af876
2021-04-19 08:04:14 +00:00
Chiachang Wang
9192f34c81 Merge "Update the permission check for dump" am: 32032cbfe3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678985

Change-Id: I48703e74bea2a878ded3850dc5be6ec12e5c8e87
2021-04-19 05:52:38 +00:00
Chiachang Wang
32032cbfe3 Merge "Update the permission check for dump" 2021-04-19 05:37:09 +00:00
Remi NGUYEN VAN
ae15a30cf0 Merge "Add a test for ParseException" am: 68090c1373
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675625

Change-Id: I2ef380a3b4c2f0170c77baa11ca3cbcf10b21bed
2021-04-19 05:19:30 +00:00
Remi NGUYEN VAN
68090c1373 Merge "Add a test for ParseException" 2021-04-19 04:57:31 +00:00
Treehugger Robot
73c7bd3f55 Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: 29d0c73416
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673168

Change-Id: If9d47012f075bed0adaf9ef2b88c5c6bd40637b1
2021-04-19 03:32:21 +00:00
Chiachang Wang
d0365eb2d7 Update the permission check for dump
ServicePermissionsTest#testDumpProtected expects to see nothing
from dump() if the caller does not have the required permission.

After the refactor the ConnectivityService#dump(). It does not
leak real information for those callers without permission but
show the title of dumpsys, i.e. it shows "DUMP OF SERVICE HIGH
connectivity". This breaks the test since the test expects to
see nothing.

Move the permission check to the front of dump call stack since
there is no way to call other private dump related methods.

Bug: 185425662
Test: atest android.security.cts.ServicePermissionsTest
Test: adb shell dumpsys connectivity
Change-Id: I173c968a4f1c4d6f618ed87725a6ccda8d309988
2021-04-19 11:09:15 +08:00
Treehugger Robot
29d0c73416 Merge "Move CtsHostsideNetworkTests to group presubmit-large" 2021-04-19 03:05:59 +00:00
Tianjie
bd0bc157d3 Revisit the lifetime of the RebootEscrowProvider
Currently the RebootEscrowProvider is created as part of the boot
process, when device tries to restore the escrow data. This will
fail the first RoR boot attempt after we switch from HAL based
-> server based. So revisit the logic to reduce the time for
RebootEscrowManager to hold the provider in RAM.

Now we attempt to create a new provider object when
1. new RoR preparation request
2. load / restore escrow data (after reboot)
3. clear rebootescrow, as we want to clear provider's internal data
4. lskf capture

We reuse the old provider in memory when
1. arm reboot escrow, right before reboot (we don't switch the provider
   after lskf is captured)

we clear the provider in memory when
1. after clear rebootescrow, so new RoR request can create a new one
2. after we finish restoring escrow data

Bug: 184676743
Test: unittest, cts test
Change-Id: I2109cbe69f0ebba766aabf30feb141053496354f
2021-04-17 19:35:24 -07:00
Brad Ebinger
844b7dee2a Hide RCS PUBLISH mapping due to complicated structure
Hide until we can encode complicated structures like this
in something like a parcelable.

Bug: 182370110
Test: manual
Change-Id: I1797da52bfd447f198b48bd163b1bd0944aadb58
2021-04-17 21:07:45 +00:00
Brad Ebinger
e09fc1cd18 Clarify SipDelegateImsConfiguration getVersion Documentation
Bug: 181764870
Test: docs only change
Change-Id: I5ced81d33d80ecc90f704d910c08d0625396d163
2021-04-17 20:40:43 +00:00
Janis Danisevskis
f941d3fb5b Merge "Fix operation auth bound keys." am: b3671c4ab5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677200

Change-Id: I25a5f2d933e3bdb97057b2dd470213538f5f5c06
2021-04-17 06:18:24 +00:00
Janis Danisevskis
b3671c4ab5 Merge "Fix operation auth bound keys." 2021-04-17 05:51:38 +00:00
Janis Danisevskis
8c97d4fe79 Fix operation auth bound keys.
CryptoObject still called the legacy AndroidKeystoreProvider which did
not return the correct operation handle for per operation auth bound
keys.

Bug: 184804041
Bug: 185181377
Test: CtsVerifier->Security->Biometric Tests->2a Strong Biometrics +
      Crypto
Merged-In: I0bceff0425e7ef32c394f33deda3c78f729c0c6c
Change-Id: I0bceff0425e7ef32c394f33deda3c78f729c0c6c
2021-04-16 12:55:33 -07:00
Junyu Lai
7de0a9088f Merge "[VCN20] Change requestBackgroundNetwork argument order" am: 28aca09bbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I73df5528088176070af6e54e01358b1edec27b50
2021-04-16 16:25:55 +00:00