Commit graph

30444 commits

Author SHA1 Message Date
Ilya Matyukhin
42a106315b Add IFace#reset and ISession#close methods
Bug: 180625923
Test: m android.hardware.biometrics.face-update-api
Test: build
Change-Id: I6ec2436ff4ae4c11a177ab911aebe4e80a591089
2021-02-19 02:12:19 -08:00
Ilya Matyukhin
71005c5499 Update default HAL with close and reset methods
Bug: 180521746
Test: atest VtsHalBiometricsFingerprintTargetTest
Change-Id: I3331f8185ff90106a2500fe5ca17836e8127add5
2021-02-19 00:59:34 -08:00
Ilya Matyukhin
4ae95d73eb Add IFingerprint#reset and ISession#close methods
Bug: 180521746
Test: m android.hardware.biometrics.fingerprint-update-api
Test: build
Change-Id: Ie69ea596dbbaefd4ee360facb2b57a21c8c0a46f
2021-02-19 00:59:27 -08:00
Robert Shih
b0b83b3ee1 drm: vts for V1_4::ICrypto/DrmPlugin::getLogMessages
Bug: 162255728
Test: VtsHalDrmV1_4TargetTest
Change-Id: I5e05c4d36f983053ab80495258112a4d57076436
2021-02-19 08:45:22 +00:00
Sarah Chin
b5ae2a072d [automerger skipped] Merge "Allow getSystemSelectionChannels to return specifiers" am: c3325707a5 am: 3e8439d5ec am: 6a0a1a18d5 -s ours
am skip reason: Change-Id I574e897c0fdb57cad1a3655c34d43f0d080de9ae with SHA-1 bb4c2fdc02 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a4e9d0f4761ee7bc31abbdaaf8e97b8cd845077
2021-02-19 03:07:08 +00:00
Yifan Hong
390d4faacf Remove biometrics face 1.1 from R compatibility matrix. am: 721de0e84a am: 23b51b3213 am: 8683e257f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie88563e266d7ae93ffb23f7e69595dbf2b4cd5e2
2021-02-19 03:06:51 +00:00
Yifan Hong
5b9acf8599 [automerger skipped] Revert "Add default implementation for biometrics.face@1.1" am: f40d4899b4 am: e195ae6df6 am: 44d39e0a10 -s ours
am skip reason: Change-Id Id81783c9e67e63c8717fcb216e52d0d6da203c60 with SHA-1 513ef09a21 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6e35803f006ba2cdd5c177fa2bfade614b3be8a
2021-02-19 03:06:49 +00:00
Sarah Chin
6a0a1a18d5 Merge "Allow getSystemSelectionChannels to return specifiers" am: c3325707a5 am: 3e8439d5ec
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcf32fd1c720c3f08ecfc3fe16582ca9f121fa33
2021-02-19 02:32:42 +00:00
Yifan Hong
8683e257f8 Remove biometrics face 1.1 from R compatibility matrix. am: 721de0e84a am: 23b51b3213
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I661a7113ee46906141114a675b31e76f311e953d
2021-02-19 02:31:52 +00:00
Yifan Hong
44d39e0a10 Revert "Add default implementation for biometrics.face@1.1" am: f40d4899b4 am: e195ae6df6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43a1078aa7119eb64db440e62fabdeb757ef3978
2021-02-19 02:31:50 +00:00
Sarah Chin
3e8439d5ec Merge "Allow getSystemSelectionChannels to return specifiers" am: c3325707a5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595753

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I058cf804b82f3664be863e8c691b20caa79c9721
2021-02-19 01:42:00 +00:00
Yifan Hong
23b51b3213 Remove biometrics face 1.1 from R compatibility matrix. am: 721de0e84a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595752

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id41b5f38c3ca1247b9703e337d536234fde43c61
2021-02-19 01:40:58 +00:00
Yifan Hong
e195ae6df6 Revert "Add default implementation for biometrics.face@1.1" am: f40d4899b4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1595751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I228df6bfa4aa65d1e17ca5785b41135f4204d1cb
2021-02-19 01:40:08 +00:00
Sarah Chin
c3325707a5 Merge "Allow getSystemSelectionChannels to return specifiers" 2021-02-19 00:34:29 +00:00
Sarah Chin
e52a3943ea Allow getSystemSelectionChannels to return specifiers
Bug: 179929817
Test: VTS
Change-Id: I574e897c0fdb57cad1a3655c34d43f0d080de9ae
Merged-In: I574e897c0fdb57cad1a3655c34d43f0d080de9ae
2021-02-18 15:12:50 -08:00
Yifan Hong
721de0e84a Remove biometrics face 1.1 from R compatibility matrix.
Its HAL definition is removed in R, but the entry is not
properly removed in matrices.

Test: pass
Bug: 179207135
Change-Id: Ibe45dc456708551c3312fda4ce3522086ae23812
2021-02-18 15:06:28 -08:00
Yifan Hong
f40d4899b4 Revert "Add default implementation for biometrics.face@1.1"
This reverts commit 366cc53714.

Reason for revert: b/179207135.  I1aa682644b9 is not a full revert
of the original CL, so properly revert the rest.

Bug: 179207135
Test: pass

Change-Id: Id81783c9e67e63c8717fcb216e52d0d6da203c60
Merged-In: Id81783c9e67e63c8717fcb216e52d0d6da203c60
2021-02-18 14:29:36 -08:00
Michael Butler
98de57e36b Merge changes from topic "nnapi-canonical-ahwb" am: 8548f574ee am: ece0b71cc1 am: ae714190a0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593092

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b491b80f1f1c5f3a34b5a54b565c7dd2e7ebe68
2021-02-18 22:26:06 +00:00
Michael Butler
5d10c72c89 Change NNAPI Memory to ref-counted SharedMemory -- hal am: fadeb8a920 am: 243afb03eb am: 54146d829d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593091

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68e6d3ae01d2074706e5dc5453afd9e6a3789290
2021-02-18 22:26:03 +00:00
Michael Butler
ae714190a0 Merge changes from topic "nnapi-canonical-ahwb" am: 8548f574ee am: ece0b71cc1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593092

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003fdfdfd480a17f1d3549d25631dea8a91cd55c
2021-02-18 22:00:12 +00:00
Michael Butler
54146d829d Change NNAPI Memory to ref-counted SharedMemory -- hal am: fadeb8a920 am: 243afb03eb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593091

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c909ba2163db181e81ec4fd6c34f4dc0d4d9a65
2021-02-18 22:00:10 +00:00
Michael Butler
ece0b71cc1 Merge changes from topic "nnapi-canonical-ahwb" am: 8548f574ee
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593092

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14deb62e82c7629de5cb62c61bf043ada37ab95c
2021-02-18 21:24:10 +00:00
Michael Butler
243afb03eb Change NNAPI Memory to ref-counted SharedMemory -- hal am: fadeb8a920
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593091

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic16c1df5174c8926683aabc8a655c6e5ab2b2ed7
2021-02-18 21:23:15 +00:00
Michael Butler
8548f574ee Merge changes from topic "nnapi-canonical-ahwb"
* changes:
  Store AHWB in NN canonical memory type -- hal
  Change NNAPI Memory to ref-counted SharedMemory -- hal
2021-02-18 20:18:41 +00:00
TreeHugger Robot
197231f6f9 Merge "Allow getSystemSelectionChannels to return specifiers" into sc-dev 2021-02-18 16:56:25 +00:00
Treehugger Robot
25f9efe9bc Merge "Specify version for aidl_interface explicitly" am: cb2ba40919 am: 2e0eb52a5b am: 57fd21d4df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a2314d21cdd8515da7f52d01e6d9c1f96b9344a
2021-02-18 16:19:35 +00:00
Treehugger Robot
57fd21d4df Merge "Specify version for aidl_interface explicitly" am: cb2ba40919 am: 2e0eb52a5b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d6d6f9f6be327776b23a36a740a50db3138dbe
2021-02-18 15:46:52 +00:00
Treehugger Robot
2e0eb52a5b Merge "Specify version for aidl_interface explicitly" am: cb2ba40919
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6e93784d48dcb7ebfab027f452e7e0fc09ccfd6
2021-02-18 15:17:10 +00:00
Treehugger Robot
cb2ba40919 Merge "Specify version for aidl_interface explicitly" 2021-02-18 12:59:44 +00:00
TreeHugger Robot
53d03fe0eb Merge "Revert "Add default implementation for biometrics.face@1.1"" into sc-dev 2021-02-18 01:20:20 +00:00
Yin-Chia Yeh
5f67650997 Merge "Camera: add default secure image size key" into sc-dev 2021-02-18 00:15:09 +00:00
Yifan Hong
513ef09a21 Revert "Add default implementation for biometrics.face@1.1"
This reverts commit 366cc53714.

Reason for revert: b/179207135.  I1aa682644b9 is not a full revert
of the original CL, so properly revert the rest.

Bug: 179207135
Test: pass

Change-Id: Id81783c9e67e63c8717fcb216e52d0d6da203c60
2021-02-17 23:59:49 +00:00
Treehugger Robot
ab133ff65c Merge "power/stats: Add more energy consumer types" am: a5ec53d68f am: 807acbb8c4 am: 1e63ebcda9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584748

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb68958515ff595651fd3e3737c00f1c55422342
2021-02-17 23:19:19 +00:00
Treehugger Robot
1e63ebcda9 Merge "power/stats: Add more energy consumer types" am: a5ec53d68f am: 807acbb8c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584748

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ba202b9865876cbbd604db97e64cd507742eaca
2021-02-17 22:41:20 +00:00
Treehugger Robot
807acbb8c4 Merge "power/stats: Add more energy consumer types" am: a5ec53d68f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584748

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie661b6a70d04d2f60b196e219868692228537760
2021-02-17 22:24:11 +00:00
Treehugger Robot
a5ec53d68f Merge "power/stats: Add more energy consumer types" 2021-02-17 22:04:34 +00:00
Benjamin Schwartz
0e74eb234e Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6 am: e7cdfd9a6d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcc226047c6719a5599ea338ed57c1a1a16f0426
2021-02-17 20:50:44 +00:00
Shawn Willden
0a21d6ecb6 Add KeyPurpose::ATTEST_KEY. am: 7c13039711 am: 99ac9848df am: cad4604a2e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5340ad2ac563ef786eb5ad0a77f29d4dc13156fc
2021-02-17 20:49:10 +00:00
Benjamin Schwartz
e7cdfd9a6d Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf31eb2079cf63608ff344e135430cf132d821a5
2021-02-17 20:27:04 +00:00
Sarah Chin
bb4c2fdc02 Allow getSystemSelectionChannels to return specifiers
Bug: 179929817
Test: VTS
Change-Id: I574e897c0fdb57cad1a3655c34d43f0d080de9ae
2021-02-17 12:24:10 -08:00
Vince Leung
4bae4f943d vibrator: aidl: Add get f0 and get Q APIs
Add APIs to get f0, resonant frequency, and Q factor.

Bug: 178826612
Test: m and verify using idlcli
Change-Id: I834693693a91871f988504d2d9448497ef10e7fc
2021-02-17 20:16:47 +00:00
Shawn Willden
cad4604a2e Add KeyPurpose::ATTEST_KEY. am: 7c13039711 am: 99ac9848df
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac28faafc3980ee813d904961d9fc8ac77d33755
2021-02-17 20:14:55 +00:00
Benjamin Schwartz
eb214d0328 power/stats: Add more energy consumer types
Adding bluetooth, mobile radio, gnss, and wifi types

Bug: 176117316
Test: build
Change-Id: I6e22c426910c31bd65e2ec7cd569983a0d005007
2021-02-17 12:12:11 -08:00
Benjamin Schwartz
9202d2c0a6 Merge "power/stats: Clean up warnings" am: dfd890a101
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1582855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8166e0764e66f0fd4da3a51e42c3ffe0b52d7b94
2021-02-17 20:09:20 +00:00
Benjamin Schwartz
dfd890a101 Merge "power/stats: Clean up warnings" 2021-02-17 19:58:50 +00:00
Shawn Willden
99ac9848df Add KeyPurpose::ATTEST_KEY. am: 7c13039711
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1534063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd239ffc5407842834bb07bb70a50f53a61a771e
2021-02-17 19:42:23 +00:00
Ilya Matyukhin
c9eccc49be Merge changes Ic84efbde,I7c1c6044 into sc-dev
* changes:
  Implement a simple worker thread
  Move headers to include/ and clean up style
2021-02-17 18:41:01 +00:00
Michael Butler
ab2f482af3 Store AHWB in NN canonical memory type -- hal
Prior to this CL, the canonical memory type only held a SharedHandle,
which mirrors the behavior of native_handle_t/hidl_handle. This means
memory types including AHardwareBuffer were stored as this SharedHandle
type. With this CL, the canonical memory type is stored directly as
AHardwareBuffer to avoid using non-NDK AHardwareBuffer calls in the NN
runtime.

Bug: 179906132
Test: mma
Test: NeuralNetworksTest_static
Test: presubmit
Change-Id: I394071c193d15ac0c90ac47e5a2a9a79c635db6c
Merged-In: I394071c193d15ac0c90ac47e5a2a9a79c635db6c
(cherry picked from commit bbe43d950e)
2021-02-17 10:15:39 -08:00
Michael Butler
fadeb8a920 Change NNAPI Memory to ref-counted SharedMemory -- hal
Bug: 179906132
Test: mma
Test: NeuralNetworksTest_static
Test: presubmit
Change-Id: I6435db906a2efe4938da18149a1fcd6d24730a95
Merged-In: I6435db906a2efe4938da18149a1fcd6d24730a95
(cherry picked from commit 79a16ebb6f)
2021-02-17 10:15:09 -08:00
Robert Shih
7508059e79 Merge "drm@1.4: reorder LogPriority to match android_LogPriority" into sc-dev 2021-02-17 16:35:26 +00:00