Satya Tangirala
aa32e69039
Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" am: 38b3bcee7f
am: d037d2a2c7
am: ae368b8c17
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622545
Change-Id: I21ebe3153fd278c3ba9e74f850bd4fe445aa1ee2
2021-03-24 05:49:44 +00:00
Satya Tangirala
ae368b8c17
Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" am: 38b3bcee7f
am: d037d2a2c7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622545
Change-Id: I7aeba5e9d1d7cd48066677f9ed39c1aea47128fb
2021-03-24 05:02:26 +00:00
Satya Tangirala
d037d2a2c7
Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" am: 38b3bcee7f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622545
Change-Id: I537219835bb45ccf0ac746e4e1c47751fa63aff0
2021-03-24 04:19:30 +00:00
Kai Wang
25274e82aa
Merge "Convert VTS for VHAL from python to gtest" into sc-dev
2021-03-24 04:15:18 +00:00
Satya Tangirala
38b3bcee7f
Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice"
2021-03-24 03:43:38 +00:00
Les Lee
a42f20168d
Merge "wifi: Correct document for SAP 11AX mode" into sc-dev
2021-03-24 01:11:55 +00:00
lesl
a2f3e4bab9
wifi: Correct document for SAP 11AX mode
...
Current hostapd doesn't support mode: HOSTAPD_MODE_IEEE80211AX.
Using he_capabilies->he_supported to identify if the current mode is
AX.
BYPASS_INCLUSIVE_LANGUAGE_REASON : The HE is a abbreviation
which is High-Efficiency.
Bug: 162484222
Test: Enable SAP on P21 (supported AX) and check the wifistandard is
AX mode.
BYPASS_INCLUSIVE_LANGUAGE_REASON=The HE is a abbreviation
which is High-Efficiency.
Change-Id: I1f40f2e2e5a0d1a862810d19899a6d968d8c29b2
2021-03-24 01:10:53 +00:00
bohu
f001b12854
gnss: allows custom gnss device name
...
This is a temporary workaround the missing kernel
support of reclaiming virtio-console as gnss0 device.
When kernel can support converting virtio-console to
gnss0 device, this cl can be reverted
Bug: 180435101
Change-Id: I6e48b6c446dd945f066fbd8f5471b77226eba68b
2021-03-24 01:05:34 +00:00
Amit Mahajan
812a33cb40
Merge "add capability for TelephonyManager.getNetworkSlicingConfiguration()" into sc-dev
2021-03-23 21:10:37 +00:00
Janis Danisevskis
eaeb1bc518
security.sharedsecret: Add rust derives and fix docs. am: 442a08d3ee
am: 97b86f8dab
am: c732eaff9f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1647987
Change-Id: Id6def2c2dddf6bec5f1663e61cab546864ca4a5d
2021-03-23 17:56:13 +00:00
Janis Danisevskis
c732eaff9f
security.sharedsecret: Add rust derives and fix docs. am: 442a08d3ee
am: 97b86f8dab
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1647987
Change-Id: I92be349d6b353f24d1f63b590782334ba35faf4c
2021-03-23 17:31:33 +00:00
Janis Danisevskis
97b86f8dab
security.sharedsecret: Add rust derives and fix docs. am: 442a08d3ee
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1647987
Change-Id: Ifcb64e79927a5da199493b85227c4fa63a912e73
2021-03-23 16:53:26 +00:00
TreeHugger Robot
a3434d47f1
Merge "Add media.c2@1.2" into sc-dev
2021-03-23 16:46:27 +00:00
Treehugger Robot
418843cf75
[automerger skipped] Merge "Security: Provide generated java sources." am: 2d56123a87
am: f56ef2c88f
am: aa02923c2a
-s ours
...
am skip reason: skip tag Change-Id If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379 with SHA-1 65aa12e1f2
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643002
Change-Id: I9afb14e33880873c3ac798f65e5d7a21610019cc
2021-03-23 13:59:11 +00:00
TreeHugger Robot
470fc06ab0
Merge changes from topic "b178126071_selfRecoveryEnhancement" into sc-dev
...
* changes:
Add API "startSubsystemRestart" and callback function
Uprev IWifiEventCallback.hal to 1.5
2021-03-23 10:06:54 +00:00
TreeHugger Robot
e66993fd28
Merge "Fix flaky WorkerThreadTest" into sc-dev
2021-03-23 02:03:29 +00:00
Satya Tangirala
c757c1ba39
Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice
...
Add a function convertStorageKeyToEphemeral to IKeymintDevice that vold
can use to get a per-boot ephemeral key from a wrapped storage key.
Bug: 181806377
Bug: 181910578
Change-Id: I1b008423e3e24797132c8eb79ab3899e2b1c68e8
2021-03-22 17:39:36 -07:00
Ilya Matyukhin
71823fad7b
Merge "Add ISessionCallback#onSessionClosed" into sc-dev
2021-03-23 00:07:02 +00:00
Henry Fang
84978c1c48
Merge "Close stream at end of OpenAnOpenedStreamsTest" am: edd9dea02c
am: c127d95b71
am: 9069693ab0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1513650
Change-Id: I66da2f861e081e40c18d4671708809f3037523f9
2021-03-22 23:20:54 +00:00
Treehugger Robot
aa02923c2a
Merge "Security: Provide generated java sources." am: 2d56123a87
am: f56ef2c88f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643002
Change-Id: If9cf2ea18fa7b1904a7199e211679b448a1510d4
2021-03-22 23:18:46 +00:00
Sungtak Lee
aede9615c7
Add media.c2@1.2
...
Add setOutputSurfaceWithSyncObj() to IComponent.
Test: make vts -j123 && vts-tradefed run commandAndExit vts \
-m VtsHAlMediaC2V1_0Host
Bug: 157111613
Change-Id: I5a52b3d9448ea88681eb9b1b409f89723f732e9b
2021-03-22 15:59:46 -07:00
Treehugger Robot
f56ef2c88f
Merge "Security: Provide generated java sources." am: 2d56123a87
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643002
Change-Id: I68ba56a96ed0717c3fb43bad66b6150cfce0fbd9
2021-03-22 22:52:25 +00:00
Henry Fang
9069693ab0
Merge "Close stream at end of OpenAnOpenedStreamsTest" am: edd9dea02c
am: c127d95b71
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1513650
Change-Id: Ia284d780b468c152eb25905a8f47154956855fcc
2021-03-22 22:38:36 +00:00
Janis Danisevskis
442a08d3ee
security.sharedsecret: Add rust derives and fix docs.
...
Add rust derives to SecretSharingParameters.
Also fix some comments.
Test: N/A
Change-Id: Id3f02744d2880e59c678d781344bcbb83e8c8864
2021-03-22 15:35:38 -07:00
Treehugger Robot
2d56123a87
Merge "Security: Provide generated java sources."
2021-03-22 22:31:56 +00:00
Ilya Matyukhin
1d998ec20e
Fix flaky WorkerThreadTest
...
Bug: 183250492
Test: atest --host android.hardware.biometrics.fingerprint.WorkerThreadTest
Change-Id: Ic51681103989d13d5c968d9b7ce1ebf9a306edee
2021-03-22 22:05:27 +00:00
Henry Fang
c127d95b71
Merge "Close stream at end of OpenAnOpenedStreamsTest" am: edd9dea02c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1513650
Change-Id: Iabf80e68439e25a1098f9eb8120af87f29cba350
2021-03-22 21:55:56 +00:00
Ilya Matyukhin
cbbfa93a17
Add ISessionCallback#onSessionClosed
...
Bug: 181984005
Test: m android.hardware.biometrics.fingerprint-update-api
Test: m android.hardware.biometrics.face-update-api
Test: atest VtsHalBiometricsFingerprintTargetTest
Change-Id: I766c3ae0dc9916c376da6432a5545af581dda819
2021-03-22 14:43:22 -07:00
Henry Fang
edd9dea02c
Merge "Close stream at end of OpenAnOpenedStreamsTest"
2021-03-22 21:29:12 +00:00
Przemyslaw Szczepaniak
66689d7e9c
Merge changes from topic "nnapi-aidl-burst" am: e24a7e57e2
am: 7f4c0a220d
am: 143f103042
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645423
Change-Id: I631fa491d92cbdf631dce0b1648acb66b66f0750
2021-03-22 20:38:16 +00:00
Michael Butler
cc0e49681c
Add IBurst to NN AIDL HAL -- hal am: 88e6e9e66f
am: 68a4a14ff4
am: a2381f49cc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645422
Change-Id: Ie056e56a0629b78392265af070df5a31eb723460
2021-03-22 20:38:14 +00:00
Michael Butler
85a9c330db
Format NN AIDL HAL am: 37dcda8704
am: ff362f5343
am: 9da30e1063
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645421
Change-Id: I4cac0f4aa4159469ca9f8a99ee6f312ed5f10639
2021-03-22 20:38:11 +00:00
Janis Danisevskis
61eadb7ce4
Security: Provide generated java sources.
...
Enable generation of java sources for AIDL interfaces. This allows
enabling the @SensitiveData annotation without causing circular build
dependencies.
Also mark doc comments as @hide to prevent the interface from being
included in the SDK.
Bug: 174857732
Test: N/A
Merged-In: If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379
Change-Id: If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379
2021-03-22 20:02:39 +00:00
Przemyslaw Szczepaniak
143f103042
Merge changes from topic "nnapi-aidl-burst" am: e24a7e57e2
am: 7f4c0a220d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645423
Change-Id: Ibff0263286415ac523ab19c93d59c19bcd429749
2021-03-22 19:52:42 +00:00
Michael Butler
a2381f49cc
Add IBurst to NN AIDL HAL -- hal am: 88e6e9e66f
am: 68a4a14ff4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645422
Change-Id: I02334478bd191924cc998c1cce002710dd833da3
2021-03-22 19:52:40 +00:00
Michael Butler
9da30e1063
Format NN AIDL HAL am: 37dcda8704
am: ff362f5343
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645421
Change-Id: Id101e59db0aee71b3e677a8cbf18cb79106ae4bd
2021-03-22 19:52:38 +00:00
Przemyslaw Szczepaniak
7f4c0a220d
Merge changes from topic "nnapi-aidl-burst" am: e24a7e57e2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645423
Change-Id: Iee324e1209c70e255d336cf6823e505346bba960
2021-03-22 19:19:58 +00:00
Michael Butler
68a4a14ff4
Add IBurst to NN AIDL HAL -- hal am: 88e6e9e66f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645422
Change-Id: I4f3e5d6fc2e7e357910bc0106a1974dc0ac8279a
2021-03-22 19:19:55 +00:00
Michael Butler
ff362f5343
Format NN AIDL HAL am: 37dcda8704
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1645421
Change-Id: I50dbe2311dd36545015db68a11f7c3927edb658c
2021-03-22 19:19:05 +00:00
Janis Danisevskis
270d50d49b
Merge "Security: Provide generated java sources." into sc-dev
2021-03-22 17:51:45 +00:00
Przemyslaw Szczepaniak
e24a7e57e2
Merge changes from topic "nnapi-aidl-burst"
...
* changes:
Add Burst tests to NN AIDL HAL VTS
Add IBurst to NN AIDL HAL -- hal
Format NN AIDL HAL
2021-03-22 17:07:23 +00:00
Hongbo Zeng
723021f42e
add capability for TelephonyManager.getNetworkSlicingConfiguration()
...
- add comment to specify HAL interface getSlicingConfig() which is used
by TelephonyManager.getNetworkSlicingConfiguration() is in the reduced
feature set.
- allow REQUEST_NOT_SUPPORTED for HAL interface getSlicingConfig() and
update related VTS test case.
Bug: 181713905
Test: run "atest VtsHalRadioV1_6TargetTest" and check the result for
getSlicingConfig is PASSED
[3/17] PerInstance/RadioHidlTest_v1_6#getSlicingConfig/0_slot1: PASSED (9ms)
Change-Id: Ia318b8225e8b0e772a85bb9909f2e0114e0ae6e3
2021-03-22 22:23:45 +08:00
Treehugger Robot
22ba64d88f
Merge "Move NNAPI type information to types.spec" am: a23a3613bc
am: 0018455816
am: 5c293f05dd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1642100
Change-Id: Id90999e2ebafeef9a08b4efba7dc2b7adfe535c7
2021-03-22 14:23:05 +00:00
Treehugger Robot
5c293f05dd
Merge "Move NNAPI type information to types.spec" am: a23a3613bc
am: 0018455816
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1642100
Change-Id: Ic974bd945f2516a018d45d4d63b13b5d211c8347
2021-03-22 13:55:19 +00:00
Jack Nudelman
6e3be2fa36
Merge "Allow REQUEST_NOT_SUPPORTED when requesting data throttling from modem." am: 55091e2ab4
am: 1b45de52c0
am: b6e101c662
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621706
Change-Id: I77ab4a73474a4d480a053ee1e2ac02e607356de8
2021-03-22 13:24:06 +00:00
Treehugger Robot
0018455816
Merge "Move NNAPI type information to types.spec" am: a23a3613bc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1642100
Change-Id: I71f35859f456ad7da1d7a72115d40ca9f5c02be5
2021-03-22 13:19:36 +00:00
Treehugger Robot
a23a3613bc
Merge "Move NNAPI type information to types.spec"
2021-03-22 12:42:40 +00:00
Jack Nudelman
b6e101c662
Merge "Allow REQUEST_NOT_SUPPORTED when requesting data throttling from modem." am: 55091e2ab4
am: 1b45de52c0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621706
Change-Id: Ia98ccbb6a856f569e8ec39731eb328cc45f9924d
2021-03-22 12:42:10 +00:00
Jack Nudelman
1b45de52c0
Merge "Allow REQUEST_NOT_SUPPORTED when requesting data throttling from modem." am: 55091e2ab4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621706
Change-Id: I29b41880b1911311ef1f084bebdc594c28560f53
2021-03-22 12:01:29 +00:00
Jack Nudelman
55091e2ab4
Merge "Allow REQUEST_NOT_SUPPORTED when requesting data throttling from modem."
2021-03-22 11:38:10 +00:00