Commit Graph

34549 Commits

Author SHA1 Message Date
Sarah Chin
02ab7331ac Merge "Allow null DataProfileInfo for IA APN to clear" 2022-01-29 01:46:13 +00:00
Sarah Chin
4ae4e1723f Allow null DataProfileInfo for IA APN to clear
Test: build
Bug: 216357727
Change-Id: If003316192f579a3970ac48eaf50cb714cf757e6
Merged-In: If003316192f579a3970ac48eaf50cb714cf757e6
2022-01-28 15:15:23 -08:00
Treehugger Robot
32a10e4c95 Merge "Add owners for IRadio VTS" 2022-01-28 20:45:36 +00:00
Sarah Chin
1755f21ff2 Add owners for IRadio VTS
Test: build
Bug: 210712359
Change-Id: I9a6cafa49de5f84647de624c69781314ceada7a1
2022-01-28 10:51:59 -08:00
Treehugger Robot
71af5c2da9 Merge "health: vendor.charger-* -> vendor.charger." 2022-01-28 01:20:11 +00:00
Treehugger Robot
2bb6c15bd9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" 2022-01-27 22:38:48 +00:00
Treehugger Robot
6e503b7a4e Merge "Remove early break for sub-HAL initialization failure" 2022-01-27 21:33:27 +00:00
Bob Badour
589e5f76f6 [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces
Added SPDX-license-identifier-Apache-2.0 to:
  nfc/aidl/Android.bp
  nfc/aidl/default/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I9ad294e992c80d7962cf097a4dc5e60a51ba0fd9
2022-01-27 10:48:29 -08:00
Seth Moore
ff225d91c0 Merge changes from topic "revert-1959803-revert-1956689-add rkp to identity-default-ENFHZTRTBV-OLKYWRVSFZ"
* changes:
  Revert^2 "Add remote key provisioning to the IC HAL"
  Revert^2 "Refactor IC support for RKP"
  Revert^2 "Log to logd in the default identity service"
  Revert^2 "Fix formatting of identity credential aidl"
2022-01-27 18:18:12 +00:00
Yifan Hong
64345cd628 health: vendor.charger-* -> vendor.charger.
Devices may have actions triggered by
init.svc.vendor.charger. If the name is changed,
these actions are not triggered properly.

The name is usually vendor.charger, so the default
service will also use vendor.charger as the name.

Test: none
Bug: 215152892
Change-Id: Icb296ae82a6f3472730fdb3abc35dcede22889e7
2022-01-26 15:53:11 -08:00
Steven Moreland
c82603654a Merge "-= src_available" 2022-01-26 23:43:03 +00:00
Yixuan Wang
105da222fb Remove early break for sub-HAL initialization failure
Bug: 212420575
Test: none
Change-Id: I38099a4edbdeffe99ae2d91fc9dc518c9da98b13
2022-01-26 21:22:44 +00:00
Steven Moreland
fe0546fe14 -= src_available
Default now. To Remove.

Bug: 215754978
Test: N/A
Change-Id: I4042a83ae624187570e7e2b2a7a1c1282906f6d0
2022-01-25 23:38:32 +00:00
Seth Moore
1bf823ce75 Revert^2 "Add remote key provisioning to the IC HAL"
be32113307

Change-Id: I55ddbddd0bc317f1f077a63b0275c4d55fd9c76f
2022-01-25 23:04:37 +00:00
Seth Moore
ff3df54c39 Revert^2 "Refactor IC support for RKP"
201e6abbd0

Change-Id: I52171d7d5253b415cdcdfcf09061629e9a20ee1a
2022-01-25 23:04:37 +00:00
Seth Moore
3fc3c4cc63 Revert^2 "Log to logd in the default identity service"
5502a1fa35

Change-Id: Iee5fb393555195be682982161ecb716ff28fa3a9
2022-01-25 23:04:37 +00:00
Seth Moore
801695e626 Revert^2 "Fix formatting of identity credential aidl"
78063761fa

Change-Id: Ib0264d155482a06e078123eaea4712c67c61e161
2022-01-25 23:04:37 +00:00
Seth Moore
6278c2d241 Merge changes from topic "revert-1956689-add rkp to identity-default-ENFHZTRTBV"
* changes:
  Revert "Fix formatting of identity credential aidl"
  Revert "Log to logd in the default identity service"
  Revert "Refactor IC support for RKP"
  Revert "Add remote key provisioning to the IC HAL"
2022-01-25 23:03:24 +00:00
Seth Moore
78063761fa Revert "Fix formatting of identity credential aidl"
Revert "Add dependency on keymint cpp lib"

Revert "Allow default identity service to call keymint"

Revert submission 1956689-add rkp to identity-default

Reason for revert: Broke git-master. Will resubmit later.
Reverted Changes:
I96dcf3027:Add remote key provisioning to the IC HAL
Id686ac33a:Add dependency on keymint cpp lib
Ib368a2a00:Log to logd in the default identity service
I7d2906de0:Refactor IC support for RKP
Iae0f14f1c:Fix formatting of identity credential aidl
I01d086a4b:Allow default identity service to call keymint

Change-Id: I36a012ca72d7b214bde813fd3a1c08a99101f607
2022-01-25 22:44:24 +00:00
Seth Moore
5502a1fa35 Revert "Log to logd in the default identity service"
Revert "Add dependency on keymint cpp lib"

Revert "Allow default identity service to call keymint"

Revert submission 1956689-add rkp to identity-default

Reason for revert: Broke git-master. Will resubmit later.
Reverted Changes:
I96dcf3027:Add remote key provisioning to the IC HAL
Id686ac33a:Add dependency on keymint cpp lib
Ib368a2a00:Log to logd in the default identity service
I7d2906de0:Refactor IC support for RKP
Iae0f14f1c:Fix formatting of identity credential aidl
I01d086a4b:Allow default identity service to call keymint

Change-Id: I051e97b4b7ec8c060b46de42092c049f12379ea5
2022-01-25 22:44:24 +00:00
Seth Moore
201e6abbd0 Revert "Refactor IC support for RKP"
Revert "Add dependency on keymint cpp lib"

Revert "Allow default identity service to call keymint"

Revert submission 1956689-add rkp to identity-default

Reason for revert: Broke git-master. Will resubmit later.
Reverted Changes:
I96dcf3027:Add remote key provisioning to the IC HAL
Id686ac33a:Add dependency on keymint cpp lib
Ib368a2a00:Log to logd in the default identity service
I7d2906de0:Refactor IC support for RKP
Iae0f14f1c:Fix formatting of identity credential aidl
I01d086a4b:Allow default identity service to call keymint

Change-Id: I0bbce79b86e1bbbc2526288072289478744d7613
2022-01-25 22:44:24 +00:00
Seth Moore
be32113307 Revert "Add remote key provisioning to the IC HAL"
Revert "Add dependency on keymint cpp lib"

Revert "Allow default identity service to call keymint"

Revert submission 1956689-add rkp to identity-default

Reason for revert: Broke git-master. Will resubmit later.
Reverted Changes:
I96dcf3027:Add remote key provisioning to the IC HAL
Id686ac33a:Add dependency on keymint cpp lib
Ib368a2a00:Log to logd in the default identity service
I7d2906de0:Refactor IC support for RKP
Iae0f14f1c:Fix formatting of identity credential aidl
I01d086a4b:Allow default identity service to call keymint

Change-Id: I76a898c04090c5befe5fb5a5d07ec2e397fdd8b3
2022-01-25 22:44:24 +00:00
Seth Moore
79fdf4d688 Merge changes from topic "add rkp to identity-default"
* changes:
  Add remote key provisioning to the IC HAL
  Refactor IC support for RKP
  Log to logd in the default identity service
  Fix formatting of identity credential aidl
2022-01-25 20:33:01 +00:00
Treehugger Robot
3812519bc1 Merge "audio VTS: Update SetConnectedStateInvalidDeviceAddress" 2022-01-25 19:35:08 +00:00
Treehugger Robot
c8459b7ad3 Merge "BtAudio: Remove "V1" in default AIDL impl name" 2022-01-25 14:13:11 +00:00
Seth Moore
3511d287ba Merge "Add uniqueId to IRemotelyProvisionedComponent" 2022-01-25 13:11:34 +00:00
George Chang
56cbb1125e Merge "Add NFC AIDL HAL VTS to presubmit checks" 2022-01-25 09:53:28 +00:00
Josh Wu
a278407671 BtAudio: Remove "V1" in default AIDL impl name
Test: m android.hardware.bluetooth.audio-impl
Bug: 203490261
Change-Id: Ie4cfeccc797cb0b5e5ab97f913459b1ffc05431b
2022-01-25 01:42:57 -08:00
Treehugger Robot
2a91bd7331 Merge "Remove never-reached 'return' statements" 2022-01-25 08:06:10 +00:00
George Chang
2e1f26cb46 Add NFC AIDL HAL VTS to presubmit checks
Bug: 205948612
Test: atest VtsAidlHalNfcTargetTest
Change-Id: Id8dd970bae298464011a2af925894f28e1481443
2022-01-25 15:11:56 +08:00
Mikhail Naganov
4993240b9c audio VTS: Update SetConnectedStateInvalidDeviceAddress
Allow IDevice.setConnectedState to return NOT_SUPPORTED
when invalid device address is passed in.

Bug: 214426419
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I5084cbeedc10696e215c8decc235433849c3bfce
2022-01-25 02:29:15 +00:00
Treehugger Robot
a366ec1a33 Merge "health: support Dock charging" 2022-01-25 01:55:20 +00:00
Seth Moore
b5b69f0e00 Add remote key provisioning to the IC HAL
The IIdentityCredentialStore can now advertise the correct
IRemotelyProvisionedComponent that is used for getting remotely
provisioned attestation keys.

IWritableIdentityCredential has a new method so it can accept remotely
provisioned keys.

Update the VTS tests to check the new RKP functionality.

Support RKP in the default identity cred service

Test: VtsHalIdentityTargetTest
Bug: 194696876
Change-Id: I96dcf3027e0f21790c35900ddf8cc0953bd3b1ca
2022-01-24 16:19:21 -08:00
Seth Moore
fc86bf4d5f Add uniqueId to IRemotelyProvisionedComponent
This id is used to differentiate between implementations of the
IRemotelyProvisionedComponent interface. This is required to track
certificates and keys for each implementation. Without an implementation
id, we would have no way to associate persisted, remote provisioning
data with the appropriate IRemotelyProvisionedComponent.

Include VTS tests for compliance.

Test: VtsHalRemotelyProvisionedComponentTargetTest
Bug: 194696876

Change-Id: Id8bca26d71ecf9e389e68a269f782a9dc5ee6f01
2022-01-24 16:19:21 -08:00
Seth Moore
3200496e75 Refactor IC support for RKP
Remote key provisioning means that attestation keys and certs are
passed in, and not pulled directly from the factory-provisioned data.

In anticipation of RKP support, parameterize/refactor some existing
functions so that we can pass keys to them. Also new extern functions
for generating an RKP-attested key as well as keypair/cert for testing.

Test: VtsHalIdentityTargetTest
Bug: 194696876
Change-Id: I7d2906de04835906682455952ebe238c3fa57321
2022-01-24 16:19:21 -08:00
Seth Moore
51efd9e0e4 Log to logd in the default identity service
This allows us to see logs in logcat for the default service.

Test: VtsHalIdentityTargetTest
Bug: 194696876
Change-Id: Ib368a2a0021f72b457fc5e4717e34bb696dfb0fb
2022-01-24 16:19:21 -08:00
Seth Moore
3b9abd3b9a Fix formatting of identity credential aidl
Fix formatting errors to keep file in compliance with the aidl style.
This allows the aidl to pass the presubmit hook.

Test: n/a
Change-Id: Iae0f14f1c0662c862d658b38465467f7f8e036ec
2022-01-24 16:19:21 -08:00
Treehugger Robot
5afd5eba36 Merge "Add OWNERS file for android/hardware/graphics/common" 2022-01-24 21:55:59 +00:00
Leon Scroggins III
38c446f3b7 Add OWNERS file for android/hardware/graphics/common
Suggested in I6f6b7f22e76609151a413ca6a6dbf55bd91911dd.

Bug: NA
Test: NA
Change-Id: Ifc55e56ee912d822adb458818da30b737a89ef5a
2022-01-24 19:58:39 +00:00
Greg Kaiser
358a2bbedb Remove never-reached 'return' statements
We style Nfc::open() to be similar to Nfc::close(), allowing us to
remove two never-reached 'return' statements, and help avoid
potential confusion with future readers of the code.

Test: TreeHugger
Bug: 204868826
Change-Id: Ieabdfbb95540cafaf00a16955f26344c92d2d482
2022-01-24 10:40:33 -08:00
Treehugger Robot
11a4d832fe Merge "VTSHalAudio: Increase test timeout for V6 and V7" 2022-01-24 17:56:50 +00:00
David Drysdale
4af9762ef7 Merge changes Ibfb6a54c,Ifa0f95fd
* changes:
  KeyMint VTS: police Ed25519 msg size limit
  KeyMint VTS: test curve 25519 functionality
2022-01-24 09:06:17 +00:00
Treehugger Robot
1c7c6b6980 Merge "BtAudio: Remove sample_rate_to_hidl_2_0_map" 2022-01-24 04:28:27 +00:00
Treehugger Robot
4909c203d1 Merge "BtAudio: Add InReadPcmData to middleware" 2022-01-24 04:26:48 +00:00
Treehugger Robot
62ae860671 Merge "BtAudio: Improve LE offload compatability" 2022-01-24 04:03:48 +00:00
Josh Wu
75462aafb5 BtAudio: Improve LE offload compatability
Bug: 203490261
Test: m android.hardware.bluetooth.audio-V1-impl
Change-Id: I7dd37cb697b03bb5fe0bdc467f8e190575e0e2e1
2022-01-23 08:30:13 -08:00
Treehugger Robot
283a876e5a Merge "composer: 2.4: vts: Add missing COMPOSER_OVERLAY allocation flag" 2022-01-23 14:02:43 +00:00
Josh Wu
653108cc56 BtAudio: Remove sample_rate_to_hidl_2_0_map
Bug: 203490261
Test: m android.hardware.bluetooth.audio-V1-impl
Change-Id: Ie19f808e304ea6f293c611d99a810a97a7e1fd94
2022-01-21 22:33:43 -08:00
Treehugger Robot
b1ab40b8d6 Merge "BtAudio: Fix SessionType mapping" 2022-01-22 06:09:44 +00:00
Josh Wu
9880f6bb3c BtAudio: Add InReadPcmData to middleware
Bug: 203490261
Test: m android.hardware.bluetooth.audio-V1-impl
Change-Id: I330226ecc38368b3838c01a191b66b700a2338a7
2022-01-21 22:03:48 -08:00