Commit graph

34383 commits

Author SHA1 Message Date
David Drysdale
4f51da1c9e Merge "KeyMint VTS: don't combine ATTEST_KEY with SIGN" 2021-11-19 07:53:34 +00:00
Michael Butler
58b61dbce0 Merge "Rename Version::ANDROID_* to kVersionFeatureLevel* -- hal" am: 8f6b82c7a5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1896056

Change-Id: I698336ca059e99a4967c0612359ee0d5229f479e
2021-11-19 03:14:38 +00:00
Michael Butler
8f6b82c7a5 Merge "Rename Version::ANDROID_* to kVersionFeatureLevel* -- hal" 2021-11-19 02:45:32 +00:00
Yifan Hong
87ece16955 health: fix running HAL in recovery mode.
- Add proper RC files
- overrides charger.recovery
- update readme for implementing recovery mode

Test: pass
Bug: 177269435
Change-Id: Id60b57978e4e5bf78af32bd67523333ba0c2a04d
2021-11-19 02:18:21 +00:00
Michael Butler
a9ebf76162 Merge "Make NNAPI Version more structured -- hal" am: 71b595549c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1890277

Change-Id: Idc83d3c0b5e2cfb1d6da853b0754cbc108f57681
2021-11-19 00:17:10 +00:00
Michael Butler
71b595549c Merge "Make NNAPI Version more structured -- hal" 2021-11-18 23:58:42 +00:00
Michael Butler
60a7b86cf0 Rename Version::ANDROID_* to kVersionFeatureLevel* -- hal
Prior to this change, version constants (e.g., Version::ANDROID_S) were
public static constants to make the version constants look as if they
were enum values. However, this method prevented versions from being
constexpr, because the Version type was incomplete by that point in
time. This change moves these version constants outside of the Version
struct, and makes them constexpr. They have the new names:
* Version::ANDROID_OC_MR1 -> kVersionFeatureLevel1
* Version::ANDROID_P -> kVersionFeatureLevel2
* Version::ANDROID_Q -> kVersionFeatureLevel3
* Version::ANDROID_R -> kVersionFeatureLevel4
* Version::ANDROID_S -> kVersionFeatureLevel5
* Version::FEATURE_LEVEL_6 -> kVersionFeatureLevel6
* Version::EXPERIMENTAL -> kVersionFeatureLevelExperimental

Bug: 206975939
Test: mma
Change-Id: Ibf5f2fdb1459a69c51865aa5fdcd0cb0c3a88ade
2021-11-18 23:56:54 +00:00
Michael Butler
34f0a8f418 Make NNAPI Version more structured -- hal
Prior to this topic, NNAPI Versions were linear and represented by an
enumeration. However, this did not properly account for the
non-linearity of runtime-specific features such as a control flow
operations with operands of dynamic sizes. This topic alters Version to
be a struct containing a feature level enumeration as well as a boolean
which indicates whether there are runtime-specific features.

Bug: 206975939
Test: mma
Test: NeuralNetworksTests_static
Change-Id: I78c54ef597bf269b137f2835332bdedac49883d4
2021-11-18 23:56:15 +00:00
Treehugger Robot
f44059b065 Merge "Wifi: P2P VTS tests fail with no P2P support" am: a4a390c0d9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1892882

Change-Id: Iba6f9e413f5f49cf0bc09ec70339e982dc669ed2
2021-11-18 21:58:54 +00:00
Treehugger Robot
a4a390c0d9 Merge "Wifi: P2P VTS tests fail with no P2P support" 2021-11-18 21:31:09 +00:00
Xin Li
76364127bf Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:29:03 +00:00
Yifan Hong
a68e416fee health: Update README.md for SELinux rule example am: d4ebad8aef
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894882

Change-Id: I97441c5c98ae10ef8449bf7e7a8f199556bdac95
2021-11-17 18:46:16 +00:00
Yifan Hong
04c4754b9c health: properly support charger mode.
Use charger_vendor SELinux context.

Also update readme to reflect the change.

Test: manual in offline-charging mode
Bug: 177269435
Change-Id: Icf5cd9d579b3365037e2d360fcc29b0ef4be1b15
2021-11-17 07:27:12 +00:00
Yifan Hong
d4ebad8aef health: Update README.md for SELinux rule example
Test: none
Bug: 177269435
Change-Id: Ifd5ef99e7dd1c27fe9973daa65ad70714f86a46b
2021-11-16 23:22:16 -08:00
Carter Hsu
66cfe34ef4 Merge "audio: Support 64bit configuration on 32+64bit compatible OS" am: f665b8fa86
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891181

Change-Id: Ib5c59bedf9314d3a026f3496ecc0830ff649032d
2021-11-17 05:06:44 +00:00
Carter Hsu
f665b8fa86 Merge "audio: Support 64bit configuration on 32+64bit compatible OS" 2021-11-17 04:50:22 +00:00
Sooraj Sasindran
e065265273 Merge "Add new VoNR api into IRadioVoice module" am: 0d9ef9f0b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1881110

Change-Id: Id1da2095f063ed4a745f9850d57dfd1f68a2fc0b
2021-11-16 22:58:31 +00:00
Hongguang Chen
5376672d34 Merge "Add blindScan condition to blindScan test" am: 32b4c5025b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894144

Change-Id: I3a2c6ae5b8997800fba3ac673a8437b86ffeaaca
2021-11-16 22:58:20 +00:00
Treehugger Robot
bd2c32ba66 Merge "Add 5.15 to the current compatibility matrix" am: 20d4bc2d00
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1887616

Change-Id: Ifa2f1cd964586e72e0022653f5cefa9efa6cd0d7
2021-11-16 22:57:55 +00:00
Sooraj Sasindran
0d9ef9f0b9 Merge "Add new VoNR api into IRadioVoice module" 2021-11-16 22:51:33 +00:00
Hongguang Chen
32b4c5025b Merge "Add blindScan condition to blindScan test" 2021-11-16 22:34:32 +00:00
Treehugger Robot
20d4bc2d00 Merge "Add 5.15 to the current compatibility matrix" 2021-11-16 22:32:28 +00:00
Michael Butler
a0c2165144 Merge "Configure Version value for each version of NN AIDL utils" am: 21e079c9e2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1890278

Change-Id: I59aedd7545813999e9913d02dd75dc1d7cf88474
2021-11-16 19:53:59 +00:00
Michael Butler
21e079c9e2 Merge "Configure Version value for each version of NN AIDL utils" 2021-11-16 19:30:51 +00:00
ming.lo
3d49487541 Add blindScan condition to blindScan test
Bug: 203389496

Change-Id: If44df620ab90b5b0247fbee15e2b2a57e27683b5
Merged-In: If44df620ab90b5b0247fbee15e2b2a57e27683b5
2021-11-16 18:56:18 +00:00
Prashant Patil
d72b35175f KeyMint: Test invalid AES key sizes
Added invalid AES key sizes to be tested for Default and TEE based
Keymint implementations.

Bug: 205679497
Test: run vts -m VtsAidlKeyMintTargetTest
Change-Id: Id9044cdc0324258c15f1daa81487c7819a780fe8
2021-11-16 15:58:09 +00:00
Yifan Hong
5ad2b7fda6 Merge "health: do not use default destructor." am: 4915df85a0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891477

Change-Id: Ic285591bb95390f867a3b2b9379704e625e73101
2021-11-16 02:41:12 +00:00
Yifan Hong
4915df85a0 Merge "health: do not use default destructor." 2021-11-16 02:25:29 +00:00
Carter Hsu
150dded787 audio: Support 64bit configuration on 32+64bit compatible OS
The default value is 'prefer32', in order to run the hardware audio
service as 64 bit on a 32+64bit OS, please add the content below
into 'device.mk':

SOONG_CONFIG_NAMESPACES += android_hardware_audio
SOONG_CONFIG_android_hardware_audio += \
	run_64bit
SOONG_CONFIG_android_hardware_audio_run_64bit := true

Bug: 205240941
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: Ic7632a4f80298721512cd538ce93945b82a9981f
2021-11-16 00:44:36 +00:00
Michael Butler
20f76f3654 Configure Version value for each version of NN AIDL utils
Currently, there are two different versions of the NN AIDL utils:
* neuralnetworks_utils_hal_aidl_v1 (v1)
* neuralnetowrks_utils_hal_aidl (v2)

This change configures utils::kVersion to match the version of the
utility library that builds it.

Bug: N/A
Test: mma
Change-Id: I7d08bf50f76664702ec0828cc35a363eb29bdde3
2021-11-15 15:42:28 -08:00
Michael Butler
3e31733ee7 Merge "Consolidate NNAPI OWNERS files" am: 161883c967
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1892878

Change-Id: I68a0c1e2ebff9c1b2ae20eb4240a0a4e87faefcc
2021-11-15 23:42:11 +00:00
Michael Butler
161883c967 Merge "Consolidate NNAPI OWNERS files" 2021-11-15 23:22:05 +00:00
Blair Prescott
7156c06525 Wifi: P2P VTS tests fail with no P2P support
Skip P2P tests if P2P is not supported.

Bug: 200064365
Test: run vts -m VtsHalWifiSupplicantP2pV1_4TargetTest
Change-Id: I6ba23bb27f24700980cab28d1ff806e5efc65ec9
2021-11-15 13:49:21 -08:00
Michael Butler
acd7955b21 Consolidate NNAPI OWNERS files
This change deletes all existing OWNERS files under
hardware/interfaces/neuralnetworks and creates a new OWNERS file with
the current NNAPI team members.

This change also updates the NNAPI project path in
hardware/interfaces/neuralnetworks/README.

Bug: 179510251
Test: N/A
Change-Id: Iaca69505c8449ae7d93be0db99205f5f56556e86
2021-11-15 20:22:41 +00:00
Gary Jian
0955e0154c Add new VoNR api into IRadioVoice module
-isVoNrEnabled
-setVoNrEnabled

Bug: 203162440
Test: make
Change-Id: Iae3e17c8ff5aa25ca0398bd179879c49deca71f5
2021-11-15 16:25:04 +08:00
Yifan Hong
2d418a2b5b health: do not use default destructor.
Otherwise, clients will need to know how to destroy
LinkedCallback, a hidden class.

Test: builds
Bug: 177269435
Change-Id: I89532755da16b672c4cbece55b943306f68cdb9e
2021-11-12 19:05:24 -08:00
Sarah Chin
dc197374e1 Merge "Remove deprecated/unused APIs from IRadio AIDL" am: 2d1a006ae4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1888342

Change-Id: I114421baca55b10dd320584f985be19f40c04a93
2021-11-13 00:11:36 +00:00
Sarah Chin
2d1a006ae4 Merge "Remove deprecated/unused APIs from IRadio AIDL" 2021-11-12 23:53:09 +00:00
Treehugger Robot
5e070c733a Merge "Fix the integration issue for HAL 2.2" am: c4718b793c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1881111

Change-Id: Ia68335b145295dd0bff8e1900933f5de6b97b95b
2021-11-12 13:05:44 +00:00
Treehugger Robot
c4718b793c Merge "Fix the integration issue for HAL 2.2" 2021-11-12 12:53:17 +00:00
Treehugger Robot
806755bf6f Merge "Support multiple RANs in one request for setSignalStrengthReportingCriteria" am: 6c6116a542
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1888982

Change-Id: I192b0b067450c3d6609849db2da61acc935e3f36
2021-11-11 22:14:26 +00:00
Treehugger Robot
6c6116a542 Merge "Support multiple RANs in one request for setSignalStrengthReportingCriteria" 2021-11-11 21:58:00 +00:00
Rambo Wang
59de6eb636 Support multiple RANs in one request for setSignalStrengthReportingCriteria
- Move AccessNetwork (RAN) into SignalThresholdInfo to be better organized
- Support specifying multiple RANs and measurement types in one request

Bug: 200055871
Test: m -j
Merged-In: Ic6762e8ca488a119b1103319e7443c4342530f8c
Change-Id: Ic6762e8ca488a119b1103319e7443c4342530f8c
(cherry picked from commit 9073f55722)
2021-11-11 12:43:19 -08:00
Sarah Chin
e5b79b8e30 Remove deprecated/unused APIs from IRadio AIDL
Test: build
Bug: 199433581
Change-Id: I6cc0e2103803f3d56a9ed451645b6d8bab29e507
Merged-In: I6cc0e2103803f3d56a9ed451645b6d8bab29e507
2021-11-11 02:11:47 -08:00
David Drysdale
3a539327e3 Merge "KeyMint VTS: extra unique ID test" am: 7a5b3d062d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1877242

Change-Id: I6c7653a62964f9980b74921d81eeed50079c4bec
2021-11-11 06:41:56 +00:00
David Drysdale
7a5b3d062d Merge "KeyMint VTS: extra unique ID test" 2021-11-11 06:25:37 +00:00
Alistair Delva
0466235d8f Add 5.15 to the current compatibility matrix
Allow devices built with minlts 5.15.0 to be assigned to the current
compatiblity checks.

Change-Id: I6be6334c6ee4feac637384bfa808f1fc57facd47
2021-11-10 14:03:07 -08:00
Yifan Hong
3678db4957 Merge "health: Also add h2aTranslate(V1_0.HealthInfo)" am: 1698fe28eb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1883265

Change-Id: Ifb34c76200d7d9b0dbc2c7006034a5d50fcae21f
2021-11-10 21:34:44 +00:00
Yifan Hong
1698fe28eb Merge "health: Also add h2aTranslate(V1_0.HealthInfo)" 2021-11-10 21:11:00 +00:00
Chen Xu
e2b1c7c0c3 Merge "Replacing SimPortInfo.portState enum with portActive flag" am: 4c718b3da6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875273

Change-Id: Ie1b571e8c19c86984c8c4cf4e76e2935ef0e9e44
2021-11-10 20:46:25 +00:00