tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
47124 commits 1 branch 0 tags 121 MiB
Commit graph

59 commits

Author SHA1 Message Date
Sarah Chin
8ab8f0d1d8 Backport VTS fixes to previous test versions 
Network scan check periodicity only if scan type is PERIODIC.
Fix MCC/MNC checks to handle null strings.

Test: atest VTS
Bug: 259674407
Change-Id: I77e0706f413ce9defb174f00ee145dcc01f5d780
Merged-In: I77e0706f413ce9defb174f00ee145dcc01f5d780
 2023-04-28 16:28:09 -07:00
Sarah Chin
658fdaaa2a Require SIM card for all VTS tests 
We check SIM card status is PRESENT before running any VTS tests, so
ensure that it's enforced in the configs as well.

Test: atest VtsHalRadioTargetTest
Bug: 237504027
Change-Id: I1b2c317e21db118e4b957804feb76f266d887b20
Merged-In: I1b2c317e21db118e4b957804feb76f266d887b20
 2023-04-27 18:44:23 -07:00
Treehugger Robot
221de90c16 Merge "VtsHalRadioV1_4Target.setPreferredNetworkTypeBitmap" into android12L-tests-dev am: 78cdf668a8 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2375494

Change-Id: I9a4715bfea07ec34c9cb0fe8f31360c778e172c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-04 01:35:00 +00:00
James-YT.lin
e3d77fb6d0 VtsHalRadioV1_4Target.setPreferredNetworkTypeBitmap 
Add mode not support check for setPreferredNetworkTypeBitmap.

Bug: 142369230
Test: run vts -m VtsHalRadioV1_4Target

Change-Id: I17b07f40b313f9b04e2f73d9b4a235ede891f8ea
(cherry picked from commit 16e7bf5ce3)
 2023-01-04 08:43:04 +00:00
Treehugger Robot
176144714e Merge "Backfill OWNERS for VtsHalRadio*." 2021-10-12 23:30:58 +00:00
Shuo Qian
07f1c21f4a Skip slot 2 for other radio modules in single sim mode 
Bug: 199986032
Test: atest
Change-Id: Idc115954c8ccb26a6127a80d466f22559be641d2
Merged-In: Idc115954c8ccb26a6127a80d466f22559be641d2
(cherry picked from commit c6a7143b1d)
 2021-10-08 16:26:21 +00:00
Yiming Pan
d0717e1fd4 Backfill OWNERS for VtsHalRadio*. 
Owner information is backfilled for the following modules:
VtsHalRadioV1_0TargetTest
VtsHalRadioV1_1TargetTest
VtsHalRadioV1_2TargetTest
VtsHalRadioV1_3TargetTest
VtsHalRadioV1_4TargetTest
VtsHalRadioV1_5TargetTest
VtsHalRadioConfigV1_1TargetTest
VtsHalRadioConfigV1_2TargetTest

Test: Tree Hugger
Bug: 143903671
Change-Id: I1e5e293a303ee554bde054ade9c8419fd0800b0d
 2021-10-05 22:27:55 +00:00
Shuo Qian
c6a7143b1d Skip slot 2 for other radio modules in single sim mode 
Bug: 199986032
Test: atest
Change-Id: Idc115954c8ccb26a6127a80d466f22559be641d2
 2021-10-01 00:22:55 +00:00
Jack Yu
36b3af727d Fixed the obsolete VTS owners 
Fix: 188209583
Test: None
Merged-In: I783cdedaad088ec1c52c2edfbea08f83c9b7a432
Change-Id: I783cdedaad088ec1c52c2edfbea08f83c9b7a432
(cherry picked from commit 879b3c0809)
 2021-05-18 18:09:59 -07:00
Jack Yu
879b3c0809 Fixed the obsolete VTS owners 
Fix: 188209583
Test: None
Change-Id: I783cdedaad088ec1c52c2edfbea08f83c9b7a432
 2021-05-14 19:18:29 +00:00
Rambo Wang
64f7fc8dde Merge "Format all Android.bp files with bpfmt to pass bpfmt buildin hook" 2021-02-26 20:57:53 +00:00
Bob Badour
b224b363de [LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces 
Added SPDX-license-identifier-Apache-2.0 to:
  atrace/1.0/Android.bp
  atrace/1.0/default/Android.bp
  atrace/1.0/vts/functional/Android.bp
  audio/2.0/Android.bp
  audio/2.0/config/Android.bp
  audio/4.0/Android.bp
  audio/4.0/config/Android.bp
  audio/5.0/Android.bp
  audio/5.0/config/Android.bp
  audio/6.0/Android.bp
  audio/6.0/config/Android.bp
  audio/7.0/Android.bp
  audio/7.0/config/Android.bp
  audio/common/2.0/Android.bp
  audio/common/4.0/Android.bp
  audio/common/5.0/Android.bp
  audio/common/6.0/Android.bp
  audio/common/7.0/Android.bp
  audio/common/7.0/example/Android.bp
  audio/common/all-versions/default/Android.bp
  audio/common/all-versions/default/service/Android.bp
  audio/common/all-versions/test/utility/Android.bp
  audio/common/all-versions/util/Android.bp
  audio/core/all-versions/default/Android.bp
  audio/core/all-versions/default/util/Android.bp
  audio/core/all-versions/vts/functional/Android.bp
  audio/effect/2.0/Android.bp
  audio/effect/2.0/xml/Android.bp
  audio/effect/4.0/Android.bp
  audio/effect/4.0/xml/Android.bp
  audio/effect/5.0/Android.bp
  audio/effect/5.0/xml/Android.bp
  audio/effect/6.0/Android.bp
  audio/effect/6.0/xml/Android.bp
  audio/effect/7.0/Android.bp
  audio/effect/7.0/xml/Android.bp
  audio/effect/all-versions/default/Android.bp
  audio/effect/all-versions/default/util/Android.bp
  audio/effect/all-versions/vts/functional/Android.bp
  audio/policy/1.0/vts/functional/Android.bp
  audio/policy/1.0/xml/Android.bp
  audio/policy/1.0/xml/pfw_schemas/Android.bp
  authsecret/1.0/Android.bp
  authsecret/1.0/default/Android.bp
  authsecret/1.0/vts/functional/Android.bp
  authsecret/aidl/Android.bp
  authsecret/aidl/default/Android.bp
  authsecret/aidl/vts/Android.bp
  automotive/audiocontrol/1.0/Android.bp
  automotive/audiocontrol/1.0/default/Android.bp
  automotive/audiocontrol/1.0/vts/functional/Android.bp
  automotive/audiocontrol/2.0/Android.bp
  automotive/audiocontrol/2.0/default/Android.bp
  automotive/audiocontrol/2.0/vts/functional/Android.bp
  automotive/can/1.0/default/libnetdevice/Android.bp
  automotive/can/1.0/hidl-utils/Android.bp
  automotive/can/1.0/tools/Android.bp
  automotive/can/1.0/tools/configurator/Android.bp
  automotive/can/1.0/tools/configurator/proto/Android.bp
  automotive/can/1.0/tools/libcanhaltools/Android.bp
  automotive/can/1.0/vts/functional/Android.bp
  automotive/can/1.0/vts/utils/Android.bp
  automotive/evs/1.0/Android.bp
  automotive/evs/1.0/default/Android.bp
  automotive/evs/1.0/vts/functional/Android.bp
  automotive/evs/1.1/Android.bp
  automotive/evs/1.1/default/Android.bp
  automotive/evs/1.1/vts/functional/Android.bp
  automotive/evs/1.1/vts/fuzzing/Android.bp
  automotive/evs/common/utils/default/Android.bp
  automotive/evs/common/utils/default/test/fuzz/Android.bp
  automotive/occupant_awareness/aidl/Android.bp
  automotive/occupant_awareness/aidl/default/Android.bp
  automotive/occupant_awareness/aidl/mock/Android.bp
  automotive/occupant_awareness/aidl/vts/functional/Android.bp
  automotive/sv/1.0/Android.bp
  automotive/sv/1.0/default/Android.bp
  automotive/sv/1.0/vts/functional/Android.bp
  automotive/vehicle/2.0/Android.bp
  automotive/vehicle/2.0/default/Android.bp
  automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
  automotive/vehicle/2.0/utils/Android.bp
  biometrics/face/1.0/Android.bp
  biometrics/face/1.0/default/Android.bp
  biometrics/face/1.0/vts/functional/Android.bp
  biometrics/fingerprint/2.1/Android.bp
  biometrics/fingerprint/2.1/default/Android.bp
  biometrics/fingerprint/2.1/vts/functional/Android.bp
  biometrics/fingerprint/2.2/Android.bp
  biometrics/fingerprint/2.2/vts/functional/Android.bp
  bluetooth/1.0/Android.bp
  bluetooth/1.0/default/Android.bp
  bluetooth/1.0/vts/functional/Android.bp
  bluetooth/1.1/Android.bp
  bluetooth/1.1/default/Android.bp
  bluetooth/1.1/vts/functional/Android.bp
  bluetooth/a2dp/1.0/Android.bp
  bluetooth/a2dp/1.0/default/Android.bp
  bluetooth/a2dp/1.0/vts/functional/Android.bp
  bluetooth/audio/2.0/Android.bp
  bluetooth/audio/2.0/default/Android.bp
  bluetooth/audio/2.0/vts/functional/Android.bp
  bluetooth/audio/2.1/Android.bp
  bluetooth/audio/2.1/default/Android.bp
  bluetooth/audio/2.1/vts/functional/Android.bp
  bluetooth/audio/utils/Android.bp
  boot/1.0/Android.bp
  boot/1.0/default/Android.bp
  boot/1.0/vts/functional/Android.bp
  boot/1.1/Android.bp
  boot/1.1/default/Android.bp
  boot/1.1/default/boot_control/Android.bp
  boot/1.1/vts/functional/Android.bp
  boot/1.2/Android.bp
  boot/1.2/default/Android.bp
  boot/1.2/vts/functional/Android.bp
  broadcastradio/1.0/Android.bp
  broadcastradio/1.0/default/Android.bp
  broadcastradio/1.0/vts/functional/Android.bp
  broadcastradio/1.1/Android.bp
  broadcastradio/1.1/default/Android.bp
  broadcastradio/1.1/vts/functional/Android.bp
  broadcastradio/2.0/Android.bp
  broadcastradio/2.0/default/Android.bp
  broadcastradio/2.0/vts/functional/Android.bp
  broadcastradio/common/tests/Android.bp
  broadcastradio/common/utils/Android.bp
  broadcastradio/common/utils1x/Android.bp
  broadcastradio/common/utils2x/Android.bp
  broadcastradio/common/vts/utils/Android.bp
  camera/common/1.0/Android.bp
  camera/common/1.0/default/Android.bp
  camera/device/1.0/Android.bp
  camera/device/1.0/default/Android.bp
  camera/device/3.2/Android.bp
  camera/device/3.2/default/Android.bp
  camera/device/3.3/Android.bp
  camera/device/3.3/default/Android.bp
  camera/device/3.4/Android.bp
  camera/device/3.4/default/Android.bp
  camera/device/3.5/Android.bp
  camera/device/3.5/default/Android.bp
  camera/device/3.6/Android.bp
  camera/device/3.6/default/Android.bp
  camera/metadata/3.2/Android.bp
  camera/metadata/3.3/Android.bp
  camera/metadata/3.4/Android.bp
  camera/metadata/3.5/Android.bp
  camera/provider/2.4/Android.bp
  camera/provider/2.4/default/Android.bp
  camera/provider/2.4/vts/functional/Android.bp
  camera/provider/2.5/Android.bp
  camera/provider/2.5/default/Android.bp
  camera/provider/2.6/Android.bp
  cas/1.0/Android.bp
  cas/1.0/default/Android.bp
  cas/1.0/vts/functional/Android.bp
  cas/1.1/Android.bp
  cas/1.1/default/Android.bp
  cas/1.1/vts/functional/Android.bp
  cas/1.2/Android.bp
  cas/1.2/default/Android.bp
  cas/1.2/vts/functional/Android.bp
  cas/native/1.0/Android.bp
  common/aidl/Android.bp
  common/fmq/aidl/Android.bp
  common/support/Android.bp
  compatibility_matrices/Android.bp
  compatibility_matrices/Android.mk
  compatibility_matrices/build/Android.bp
  compatibility_matrices/exclude/Android.bp
  configstore/1.0/Android.bp
  configstore/1.0/vts/functional/Android.bp
  configstore/1.1/Android.bp
  configstore/1.1/default/Android.mk
  configstore/utils/Android.bp
  confirmationui/1.0/Android.bp
  confirmationui/1.0/default/Android.bp
  confirmationui/1.0/vts/functional/Android.bp
  confirmationui/support/Android.bp
  contexthub/1.0/Android.bp
  contexthub/1.0/default/Android.bp
  contexthub/1.0/vts/functional/Android.bp
  contexthub/1.1/Android.bp
  contexthub/1.1/default/Android.bp
  contexthub/1.1/vts/functional/Android.bp
  contexthub/common/vts/Android.bp
  drm/1.0/Android.bp
  drm/1.0/default/Android.bp
  drm/1.0/vts/functional/Android.bp
  drm/1.1/Android.bp
  drm/1.1/vts/functional/Android.bp
  drm/1.2/Android.bp
  drm/1.2/vts/functional/Android.bp
  drm/1.3/Android.bp
  drm/1.3/vts/functional/Android.bp
  dumpstate/1.0/Android.bp
  dumpstate/1.0/default/Android.bp
  dumpstate/1.0/vts/functional/Android.bp
  dumpstate/1.1/Android.bp
  dumpstate/1.1/default/Android.bp
  dumpstate/1.1/vts/functional/Android.bp
  fastboot/1.0/Android.bp
  fastboot/1.0/default/Android.bp
  fastboot/1.1/Android.bp
  fastboot/1.1/default/Android.bp
  gatekeeper/1.0/Android.bp
  gatekeeper/1.0/default/Android.bp
  gatekeeper/1.0/software/Android.bp
  gatekeeper/1.0/software/tests/Android.bp
  gatekeeper/1.0/vts/functional/Android.bp
  gnss/1.0/Android.bp
  gnss/1.0/default/Android.bp
  gnss/1.0/vts/functional/Android.bp
  gnss/1.1/Android.bp
  gnss/1.1/default/Android.bp
  gnss/1.1/vts/functional/Android.bp
  gnss/2.0/Android.bp
  gnss/2.0/default/Android.bp
  gnss/2.0/vts/functional/Android.bp
  gnss/2.1/Android.bp
  gnss/2.1/default/Android.bp
  gnss/2.1/vts/functional/Android.bp
  gnss/common/utils/default/Android.bp
  gnss/common/utils/vts/Android.bp
  gnss/measurement_corrections/1.0/Android.bp
  gnss/measurement_corrections/1.1/Android.bp
  gnss/visibility_control/1.0/Android.bp
  graphics/allocator/2.0/Android.bp
  graphics/allocator/2.0/default/Android.bp
  graphics/allocator/2.0/utils/gralloc1-adapter/Android.bp
  graphics/allocator/2.0/utils/hal/Android.bp
  graphics/allocator/2.0/utils/passthrough/Android.bp
  graphics/allocator/3.0/Android.bp
  graphics/allocator/4.0/Android.bp
  graphics/bufferqueue/1.0/Android.bp
  graphics/bufferqueue/2.0/Android.bp
  graphics/common/1.0/Android.bp
  graphics/common/1.1/Android.bp
  graphics/common/1.2/Android.bp
  graphics/common/aidl/Android.bp
  graphics/composer/2.1/Android.bp
  graphics/composer/2.1/default/Android.bp
  graphics/composer/2.1/utils/command-buffer/Android.bp
  graphics/composer/2.1/utils/hal/Android.bp
  graphics/composer/2.1/utils/hwc2on1adapter/Android.bp
  graphics/composer/2.1/utils/hwc2onfbadapter/Android.bp
  graphics/composer/2.1/utils/passthrough/Android.bp
  graphics/composer/2.1/utils/resources/Android.bp
  graphics/composer/2.1/utils/vts/Android.bp
  graphics/composer/2.1/vts/functional/Android.bp
  graphics/composer/2.2/Android.bp
  graphics/composer/2.2/default/Android.mk
  graphics/composer/2.2/utils/command-buffer/Android.bp
  graphics/composer/2.2/utils/hal/Android.bp
  graphics/composer/2.2/utils/passthrough/Android.bp
  graphics/composer/2.2/utils/resources/Android.bp
  graphics/composer/2.2/utils/vts/Android.bp
  graphics/composer/2.2/vts/functional/Android.bp
  graphics/composer/2.3/Android.bp
  graphics/composer/2.3/default/Android.bp
  graphics/composer/2.3/utils/command-buffer/Android.bp
  graphics/composer/2.3/utils/hal/Android.bp
  graphics/composer/2.3/utils/passthrough/Android.bp
  graphics/composer/2.3/utils/vts/Android.bp
  graphics/composer/2.3/vts/functional/Android.bp
  graphics/composer/2.4/Android.bp
  graphics/composer/2.4/default/Android.bp
  graphics/composer/2.4/utils/command-buffer/Android.bp
  graphics/composer/2.4/utils/hal/Android.bp
  graphics/composer/2.4/utils/passthrough/Android.bp
  graphics/composer/2.4/utils/vts/Android.bp
  graphics/composer/2.4/vts/functional/Android.bp
  graphics/mapper/2.0/Android.bp
  graphics/mapper/2.0/default/Android.bp
  graphics/mapper/2.0/utils/hal/Android.bp
  graphics/mapper/2.0/utils/passthrough/Android.bp
  graphics/mapper/2.0/utils/vts/Android.bp
  graphics/mapper/2.0/vts/functional/Android.bp
  graphics/mapper/2.1/Android.bp
  graphics/mapper/2.1/default/Android.bp
  graphics/mapper/2.1/utils/hal/Android.bp
  graphics/mapper/2.1/utils/passthrough/Android.bp
  graphics/mapper/2.1/utils/vts/Android.bp
  graphics/mapper/2.1/vts/functional/Android.bp
  graphics/mapper/3.0/Android.bp
  graphics/mapper/3.0/utils/vts/Android.bp
  graphics/mapper/3.0/vts/functional/Android.bp
  graphics/mapper/4.0/Android.bp
  graphics/mapper/4.0/utils/vts/Android.bp
  graphics/mapper/4.0/vts/functional/Android.bp
  health/1.0/Android.bp
  health/1.0/default/Android.bp
  health/2.0/Android.bp
  health/2.0/default/Android.bp
  health/2.0/utils/libhealthhalutils/Android.bp
  health/2.0/utils/libhealthservice/Android.bp
  health/2.0/utils/libhealthstoragedefault/Android.bp
  health/2.0/vts/functional/Android.bp
  health/2.1/Android.bp
  health/2.1/default/Android.bp
  health/2.1/vts/functional/Android.bp
  health/storage/1.0/Android.bp
  health/storage/1.0/default/Android.bp
  health/storage/1.0/vts/functional/Android.bp
  health/storage/aidl/Android.bp
  health/storage/aidl/default/Android.bp
  health/storage/aidl/vts/functional/Android.bp
  health/storage/impl_common/Android.bp
  health/storage/test_common/Android.bp
  health/utils/libhealth2impl/Android.bp
  health/utils/libhealthloop/Android.bp
  identity/aidl/Android.bp
  identity/aidl/default/Android.bp
  identity/aidl/vts/Android.bp
  identity/support/Android.bp
  input/classifier/1.0/Android.bp
  input/classifier/1.0/default/Android.bp
  input/classifier/1.0/vts/functional/Android.bp
  input/common/1.0/Android.bp
  ir/1.0/Android.bp
  ir/1.0/default/Android.bp
  ir/1.0/vts/functional/Android.bp
  keymaster/3.0/Android.bp
  keymaster/3.0/default/Android.mk
  keymaster/3.0/vts/functional/Android.bp
  keymaster/4.0/Android.bp
  keymaster/4.0/default/Android.bp
  keymaster/4.0/support/Android.bp
  keymaster/4.0/vts/functional/Android.bp
  keymaster/4.0/vts/performance/Android.bp
  keymaster/4.1/Android.bp
  keymaster/4.1/default/Android.bp
  keymaster/4.1/support/Android.bp
  keymaster/4.1/vts/functional/Android.bp
  keymaster/aidl/Android.bp
  light/2.0/Android.bp
  light/2.0/default/Android.bp
  light/2.0/vts/functional/Android.bp
  light/aidl/Android.bp
  light/aidl/default/Android.bp
  light/aidl/vts/functional/Android.bp
  light/utils/Android.bp
  media/1.0/Android.bp
  media/1.0/xml/Android.mk
  media/Android.bp
  media/bufferpool/1.0/Android.bp
  media/bufferpool/2.0/Android.bp
  media/c2/1.0/Android.bp
  media/c2/1.1/Android.bp
  media/omx/1.0/Android.bp
  media/omx/1.0/vts/functional/audio/Android.bp
  media/omx/1.0/vts/functional/common/Android.bp
  media/omx/1.0/vts/functional/component/Android.bp
  media/omx/1.0/vts/functional/store/Android.bp
  media/omx/1.0/vts/functional/video/Android.bp
  memtrack/1.0/Android.bp
  memtrack/1.0/default/Android.bp
  memtrack/1.0/vts/functional/Android.bp
  memtrack/aidl/Android.bp
  memtrack/aidl/default/Android.bp
  memtrack/aidl/vts/Android.bp
  neuralnetworks/1.0/Android.bp
  neuralnetworks/1.0/utils/Android.bp
  neuralnetworks/1.0/vts/functional/Android.bp
  neuralnetworks/1.1/Android.bp
  neuralnetworks/1.1/utils/Android.bp
  neuralnetworks/1.1/vts/functional/Android.bp
  neuralnetworks/1.2/Android.bp
  neuralnetworks/1.2/utils/Android.bp
  neuralnetworks/1.2/vts/functional/Android.bp
  neuralnetworks/1.3/Android.bp
  neuralnetworks/1.3/utils/Android.bp
  neuralnetworks/1.3/vts/functional/Android.bp
  neuralnetworks/aidl/Android.bp
  neuralnetworks/aidl/utils/Android.bp
  neuralnetworks/aidl/vts/functional/Android.bp
  neuralnetworks/utils/common/Android.bp
  neuralnetworks/utils/service/Android.bp
  nfc/1.0/Android.bp
  nfc/1.0/default/Android.bp
  nfc/1.0/vts/functional/Android.bp
  nfc/1.1/Android.bp
  nfc/1.1/vts/functional/Android.bp
  nfc/1.2/Android.bp
  nfc/1.2/vts/functional/Android.bp
  oemlock/1.0/Android.bp
  oemlock/1.0/vts/functional/Android.bp
  oemlock/aidl/Android.bp
  oemlock/aidl/default/Android.bp
  oemlock/aidl/vts/Android.bp
  power/1.0/Android.bp
  power/1.0/default/Android.bp
  power/1.0/vts/functional/Android.bp
  power/1.1/Android.bp
  power/1.1/vts/functional/Android.bp
  power/1.2/Android.bp
  power/1.2/vts/functional/Android.bp
  power/1.3/Android.bp
  power/1.3/vts/functional/Android.bp
  power/aidl/Android.bp
  power/aidl/default/Android.bp
  power/aidl/vts/Android.bp
  power/stats/1.0/Android.bp
  power/stats/1.0/default/Android.bp
  power/stats/1.0/vts/functional/Android.bp
  power/stats/aidl/Android.bp
  power/stats/aidl/default/Android.bp
  power/stats/aidl/vts/Android.bp
  radio/1.0/Android.bp
  radio/1.0/vts/functional/Android.bp
  radio/1.1/Android.bp
  radio/1.1/vts/functional/Android.bp
  radio/1.2/Android.bp
  radio/1.2/default/Android.bp
  radio/1.2/vts/functional/Android.bp
  radio/1.3/Android.bp
  radio/1.3/vts/functional/Android.bp
  radio/1.4/Android.bp
  radio/1.4/vts/functional/Android.bp
  radio/1.5/Android.bp
  radio/1.5/vts/functional/Android.bp
  radio/1.6/Android.bp
  radio/1.6/vts/functional/Android.bp
  radio/config/1.0/Android.bp
  radio/config/1.0/default/Android.bp
  radio/config/1.0/vts/functional/Android.bp
  radio/config/1.1/Android.bp
  radio/config/1.1/vts/functional/Android.bp
  radio/config/1.2/Android.bp
  radio/config/1.2/vts/functional/Android.bp
  radio/config/1.3/Android.bp
  radio/config/1.3/vts/functional/Android.bp
  radio/deprecated/1.0/Android.bp
  rebootescrow/aidl/Android.bp
  rebootescrow/aidl/default/Android.bp
  rebootescrow/aidl/vts/functional/Android.bp
  renderscript/1.0/Android.bp
  renderscript/1.0/default/Android.bp
  renderscript/1.0/vts/functional/Android.bp
  secure_element/1.0/Android.bp
  secure_element/1.0/vts/functional/Android.bp
  secure_element/1.1/Android.bp
  secure_element/1.1/vts/functional/Android.bp
  secure_element/1.2/Android.bp
  secure_element/1.2/vts/functional/Android.bp
  security/keymint/aidl/Android.bp
  security/keymint/aidl/default/Android.bp
  security/keymint/aidl/vts/functional/Android.bp
  security/keymint/support/Android.bp
  security/secureclock/aidl/Android.bp
  security/secureclock/aidl/vts/functional/Android.bp
  security/sharedsecret/aidl/Android.bp
  security/sharedsecret/aidl/vts/functional/Android.bp
  sensors/1.0/Android.bp
  sensors/1.0/default/Android.bp
  sensors/1.0/vts/functional/Android.bp
  sensors/2.0/Android.bp
  sensors/2.0/default/Android.bp
  sensors/2.0/multihal/Android.bp
  sensors/2.0/vts/functional/Android.bp
  sensors/2.1/Android.bp
  sensors/2.1/default/Android.bp
  sensors/2.1/multihal/Android.bp
  sensors/2.1/vts/functional/Android.bp
  sensors/common/default/2.X/Android.bp
  sensors/common/default/2.X/multihal/Android.bp
  sensors/common/default/2.X/multihal/tests/Android.bp
  sensors/common/utils/Android.bp
  sensors/common/vts/2_X/Android.bp
  sensors/common/vts/utils/Android.bp
  soundtrigger/2.0/Android.bp
  soundtrigger/2.0/default/Android.bp
  soundtrigger/2.0/default/Android.mk
  soundtrigger/2.0/vts/functional/Android.bp
  soundtrigger/2.1/Android.bp
  soundtrigger/2.1/default/Android.mk
  soundtrigger/2.1/vts/functional/Android.bp
  soundtrigger/2.2/Android.bp
  soundtrigger/2.2/default/Android.bp
  soundtrigger/2.2/vts/functional/Android.bp
  soundtrigger/2.3/Android.bp
  soundtrigger/2.3/default/Android.bp
  soundtrigger/2.3/vts/functional/Android.bp
  tests/bar/1.0/Android.bp
  tests/bar/1.0/default/Android.bp
  tests/baz/1.0/Android.bp
  tests/baz/1.0/default/Android.bp
  tests/expression/1.0/Android.bp
  tests/extension/light/2.0/Android.bp
  tests/extension/light/2.0/default/Android.bp
  tests/extension/vibrator/aidl/Android.bp
  tests/extension/vibrator/aidl/client/Android.bp
  tests/extension/vibrator/aidl/default/Android.bp
  tests/foo/1.0/Android.bp
  tests/foo/1.0/default/Android.bp
  tests/foo/1.0/default/lib/Android.bp
  tests/hash/1.0/Android.bp
  tests/hash/1.0/default/Android.bp
  tests/inheritance/1.0/Android.bp
  tests/inheritance/1.0/default/Android.bp
  tests/lazy/1.0/Android.bp
  tests/lazy/1.1/Android.bp
  tests/libhwbinder/1.0/Android.bp
  tests/libhwbinder/1.0/default/Android.bp
  tests/libhwbinder/aidl/Android.bp
  tests/memory/1.0/Android.bp
  tests/memory/1.0/default/Android.bp
  tests/memory/2.0/Android.bp
  tests/msgq/1.0/Android.bp
  tests/msgq/1.0/default/Android.bp
  tests/multithread/1.0/Android.bp
  tests/multithread/1.0/default/Android.bp
  tests/safeunion/1.0/Android.bp
  tests/safeunion/1.0/default/Android.bp
  tests/safeunion/cpp/1.0/Android.bp
  tests/safeunion/cpp/1.0/default/Android.bp
  tests/trie/1.0/Android.bp
  tests/trie/1.0/default/Android.bp
  tetheroffload/config/1.0/Android.bp
  tetheroffload/config/1.0/vts/functional/Android.bp
  tetheroffload/control/1.0/Android.bp
  tetheroffload/control/1.0/vts/functional/Android.bp
  tetheroffload/control/1.1/Android.bp
  tetheroffload/control/1.1/vts/functional/Android.bp
  thermal/1.0/Android.bp
  thermal/1.0/default/Android.bp
  thermal/1.0/vts/functional/Android.bp
  thermal/1.1/Android.bp
  thermal/1.1/vts/functional/Android.bp
  thermal/2.0/Android.bp
  thermal/2.0/default/Android.bp
  thermal/2.0/vts/functional/Android.bp
  tv/cec/1.0/Android.bp
  tv/cec/1.0/default/Android.bp
  tv/input/1.0/Android.bp
  tv/input/1.0/default/Android.bp
  tv/input/1.0/vts/functional/Android.bp
  tv/tuner/1.0/Android.bp
  tv/tuner/1.0/default/Android.bp
  tv/tuner/1.0/vts/functional/Android.bp
  usb/1.0/Android.bp
  usb/1.0/default/Android.bp
  usb/1.0/vts/functional/Android.bp
  usb/1.1/Android.bp
  usb/1.1/vts/functional/Android.bp
  usb/1.2/Android.bp
  usb/1.2/vts/functional/Android.bp
  usb/gadget/1.0/Android.bp
  usb/gadget/1.1/Android.bp
  usb/gadget/1.1/default/Android.bp
  usb/gadget/1.1/default/lib/Android.bp
  vibrator/1.0/Android.bp
  vibrator/1.0/default/Android.bp
  vibrator/1.0/vts/functional/Android.bp
  vibrator/1.1/Android.bp
  vibrator/1.1/vts/functional/Android.bp
  vibrator/1.2/Android.bp
  vibrator/1.2/vts/functional/Android.bp
  vibrator/1.3/Android.bp
  vibrator/1.3/example/Android.bp
  vibrator/1.3/vts/functional/Android.bp
  vibrator/aidl/Android.bp
  vibrator/aidl/default/Android.bp
  vibrator/aidl/vts/Android.bp
  vr/1.0/Android.bp
  vr/1.0/default/Android.bp
  vr/1.0/vts/functional/Android.bp
  weaver/1.0/Android.bp
  weaver/1.0/vts/functional/Android.bp
  weaver/aidl/Android.bp
  weaver/aidl/default/Android.bp
  weaver/aidl/vts/Android.bp
  wifi/1.0/Android.bp
  wifi/1.0/vts/functional/Android.bp
  wifi/1.1/Android.bp
  wifi/1.1/vts/functional/Android.bp
  wifi/1.2/Android.bp
  wifi/1.2/vts/functional/Android.bp
  wifi/1.3/Android.bp
  wifi/1.3/vts/functional/Android.bp
  wifi/1.4/Android.bp
  wifi/1.4/default/Android.mk
  wifi/1.4/vts/functional/Android.bp
  wifi/hostapd/1.0/Android.bp
  wifi/hostapd/1.0/vts/functional/Android.bp
  wifi/hostapd/1.1/Android.bp
  wifi/hostapd/1.1/vts/functional/Android.bp
  wifi/hostapd/1.2/Android.bp
  wifi/hostapd/1.2/vts/functional/Android.bp
  wifi/offload/1.0/Android.bp
  wifi/offload/1.0/vts/functional/Android.bp
  wifi/supplicant/1.0/Android.bp
  wifi/supplicant/1.0/vts/functional/Android.bp
  wifi/supplicant/1.1/Android.bp
  wifi/supplicant/1.1/vts/functional/Android.bp
  wifi/supplicant/1.2/Android.bp
  wifi/supplicant/1.2/vts/functional/Android.bp
  wifi/supplicant/1.3/Android.bp
  wifi/supplicant/1.3/vts/functional/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-NCSA to:
  Android.bp
  automotive/can/1.0/Android.bp
  automotive/can/1.0/default/Android.bp

Added SPDX-license-identifier-NCSA to:
  automotive/can/1.0/default/libc++fs/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work

Change-Id: I602b072f77ff41e9eb8d3c36b6b5315d63664006
Merged-in: I602b072f77ff41e9eb8d3c36b6b5315d63664006
 2021-02-21 20:36:55 -08:00
Rambo Wang
41ca2fd21e Format all Android.bp files with bpfmt to pass bpfmt buildin hook 
bpfmt buildin hook (introduced in aosp/295130) will refuse us to
upload patch if any functional change made in those Android.bp files.

To separate formatting change from functional change, all those
Android.bp files are formatted here with command below:
find hardware/interfaces/radio/ -name Android.bp -exec bpfmt -w {} \;

Bug: 180649021
Test: atest VtsHalRadioV1_0TargetTest VtsHalRadioV1_1TargetTest
VtsHalRadioV1_2TargetTest VtsHalRadioV1_3TargetTest
VtsHalRadioV1_4TargetTest VtsHalRadioV1_5TargetTest

Change-Id: Iab8620bc1bd5035c03b693f836a115d9f688ce1d
 2021-02-18 18:50:28 -08:00
Shuo Qian
80b03d7bf2 Gate gsm/cdma radio feature only for emergency dial 
Test: vts
Bug: 176862267
Change-Id: I73a6920a94f2f703dc6ae19ad9a511673c9d035d
 2021-01-11 22:39:09 +00:00
Shuo Qian
e0a858b1d5 Merge "Skip emergency dialing VTS if device doesn't support radio" 2021-01-08 19:24:47 +00:00
Shuo Qian
628a335326 Skip emergency dialing VTS if device doesn't support radio 
Test: vts
Bug: 176862267
Change-Id: I9e72ba5cf6cb118cd68f753355f4119d33fe0019
 2021-01-07 18:56:25 +00:00
Dan Shi
ea77824cce Fix bad test config for VtsHalRadioV1_4TargetTest 
Bug: none
Test: build
Change-Id: Ie0c4895dd201735cc3a441e2e9bd3ac2290833b0
 2020-09-14 15:58:10 -07:00
Xin Li
36dcf1a404 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I6502829205ede2de914b27e6c2c5c42916af2b39
Change-Id: I7cb06511e43bd1fffd5f80a11dbdf5b1314cfe8e
 2020-08-28 13:05:04 -07:00
Shuo Qian
721fecbaaf Check emergency dialing result in DSDS or TSTS only if slot is in service or emergency only. 
Test: vts
Bug: 156525817
Change-Id: Ic4c735e6d920fc3df28eda7bc3f0b958782bf42d
Merged-In: Ic4c735e6d920fc3df28eda7bc3f0b958782bf42d
(cherry picked from commit 3381ce1f9a2c3ad06b59288e5ba359aa7a89de4e)
 2020-08-26 17:00:44 +00:00
Dan Shi
ba4d532fee Suppress gtest error for tests without any instance 
Bug: 162052785
Test: m -j vts
Change-Id: I8c1a48e6fbd7c8161137902b5332911fa0d7b8b3
 2020-07-28 15:12:32 -07:00
Sarah Chin
96f358efda Update VTS tests to use GeranBands P900 and 850 instead 
Also call stopNetworkScan to prevent DEVICE_IN_USE error

Test: run vts VtsHalRadioV1_4Target, VtsHalRadioV1_5Target
Bug: 159582104
Change-Id: If27cb00fe9eb5cf3ce2e73107ed6463c1ebb7cfd
Merged-In: If27cb00fe9eb5cf3ce2e73107ed6463c1ebb7cfd
 2020-07-22 16:00:42 -07:00
Sarah Chin
5836f407aa Update VTS tests to use GeranBands P900 and 850 instead 
Also call stopNetworkScan to prevent DEVICE_IN_USE error

Test: run vts VtsHalRadioV1_4Target, VtsHalRadioV1_5Target
Bug: 159582104
Change-Id: If27cb00fe9eb5cf3ce2e73107ed6463c1ebb7cfd
 2020-06-29 11:58:00 -07:00
Shuo Qian
41084e7ef4 Merge "Skip voice call VTS for devices that don't support voice call with new Util" 2020-05-16 02:52:07 +00:00
Shuo Qian
f2ed9ffcb9 Skip voice call VTS for devices that don't support voice call with new Util 
Bug: 154867827
Test: VtsHalRadio1_4Target
Change-Id: I888d4d4ffbff5d24bfe2b9b3cb878eb5f1e1762f
Merged-In: I888d4d4ffbff5d24bfe2b9b3cb878eb5f1e1762f
(cherry picked from commit 4e866a3020)
 2020-05-16 01:29:07 +00:00
Shuo Qian
4e866a3020 Skip voice call VTS for devices that don't support voice call with new Util 
Bug: 154867827
Test: VtsHalRadio1_4Target
Change-Id: I888d4d4ffbff5d24bfe2b9b3cb878eb5f1e1762f
 2020-05-13 01:30:01 +00:00
Steven Moreland
0b4b27183c Radio tests: root before multi-sim preparation. 
These tests assumed that they were rooted before running, and due to
a combination of b/152655658 and b/154638140, these appeared to work
when a device already happened to be rooted and the test failures showed
up as problems with the test rather than as problems with the target
preparer.

This is the same workaround being used elsewhere.

Fixes: 154445273 # specifically about VtsHalSapV1_0TargetTest
Test: atest VtsHalSapV1_0TargetTest # passes 100%

The following tests, I confirm MultiSimTargetPreparer works, although my
test device has no SIM so I cannot get fully useful results.
Test: atest VtsHalRadioV1_0TargetTest # slot2 cases can now pass
Test: atest VtsHalRadioV1_1TargetTest # slot2 cases can now pass
Test: atest VtsHalRadioV1_2TargetTest # slot2 cases can now pass
Test: atest VtsHalRadioV1_3TargetTest # fully passes
Test: atest VtsHalRadioV1_4TargetTest # fully passes

Change-Id: Id62cb2e1b7a95552b560ab1d4ff2f63c0a7569a3
 2020-05-06 14:17:05 -07:00
Dan Shi
aad51fa000 Rename vts-core to vts 
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
 2020-04-07 16:37:40 -07:00
Dan Shi
ba894f81db Rename vts-core to vts 
Bug: 151896491
Test: local build
Exempt-From-Owner-Approval: This CL update suite name vts-core to vts as
the suite name is updated. This CL won't change test logic or behavior.

Change-Id: I562b4dc50765e953800a814a8fd84a01c1b9352b
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
 2020-04-07 15:17:02 -07:00
Dan Shi
8caedd0d68 Convert VtsHalRadioV1_*TargetTest to be parameterized test 
Bug: 142397658
Bug: 142972256
Test: atest VtsHalRadioV1_0TargetTest \
  VtsHalSapV1_0TargetTest \
  VtsHalRadioV1_1TargetTest \
  VtsHalRadioV1_2TargetTest \
  VtsHalRadioV1_3TargetTest \
  VtsHalRadioV1_4TargetTest

Change-Id: I1890f7a6b1401260e87c94c2bc4e1dfa7060a0cb
 2019-11-22 13:57:26 -08:00
Nathan Harold
aad649b8df Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" 
am: 3c8f624724

Change-Id: If856c76531d329e7beac3d0b4902ecf46a7c8b6d
 2019-10-09 19:38:49 -07:00
jun.wang
5341e17199 Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime 
Add the initialization of the incrementalResultsPeriodicity and
maxSearchTime in the networkScan request.
The incrementalResultsPeriodicity and maxSearchTime are not
initialized in the networkScan request. So the default value is 0.
But the incrementalResultsPeriodicity and maxSearchTime
are required not to be 0 in subsequent tests.

CL ported from pag/1433565

Bug:140451434
Test: make vts && vts-tradefed run commandAndExit vts -m \
      VtsHalRadioV1_2Target -t RadioHidlTest_v1_2#startNetworkScan
Change-Id: I1b4e512a37d3d85ebc905a64987a40af801bce53
(cherry picked from commit f7894eb4d8c395add7c70a20520336057ae2656f)
 2019-10-09 15:41:59 -07:00
Nathan Harold
ea37be51fa Merge "Use IncrementalResults in InvalidPeriodicity" 
am: 9f50a49681

Change-Id: I4e2f90ce020f0522e4f8c7e09bb9356ee5c21b0b
 2019-09-19 14:56:16 -07:00
Nathan Harold
0fc724e299 Use IncrementalResults in InvalidPeriodicity 
Currently tests that check for incremental scan interval
range-checking have incremental scans disabled.
This CL turns on incremental scans for tests where the
invalid interval range checks are being validated.

Set Incremental Results to true for InvalidPeriodicity
Tests in Radio 1.4. This is a spiritual cherry-pick of
the exact same test copied from HAL 1.2.

Related Change-Id: I94874f538d2df70a72913b489d9298f8d1cf9b56
Related Sha: 81c811b895

Bug: 138317383
Test: atest RadioHidlTest_v1_4#startNetworkScan_InvalidPeriodicity1
Test: atest RadioHidlTest_v1_4#startNetworkScan_InvalidPeriodicity2
Change-Id: I20d6423c01dfc1c708514e798589c36666f2c0d4
 2019-09-19 00:07:21 +00:00
Xin Li
15be13ea71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 
Bug: 135460123
Change-Id: Ia07db5c8afeed7fe22a2b18d867a38390f910a81
Merged-In: Ibbd540dbb5baee46360d3fe9469212cfd8f550ba
 2019-09-08 13:06:54 -07:00
Shuo Qian
2f055676a0 Merge "Update the currentCalls before VTS notification." 
am: f0796fd497

Change-Id: I6c5748081b255d2b38e51aa285f60a786d72383a
 2019-08-27 08:46:54 -07:00
sqian
5a14d20ae8 Update the currentCalls before VTS notification. 
It's reasonable to update the global variable "currentCalls" before
notifying the reader thread. Otherwise this can cause some issues such
as null pointer dereference in other modem.

Bug: 139264227
Test: Don't have devices that uses the corresponding modem that reports
 this issues. This is verified according to a partner CL:
https://partner-android-review.googlesource.com/c/platform/hardware/interfaces/+/1422356

Change-Id: Iee9e18149397c39b7c84ec1dc570b9bac7142eb6
Merged-In: Iee9e18149397c39b7c84ec1dc570b9bac7142eb6
(cherry picked from commit fcd55caafd)
 2019-08-26 17:13:52 +00:00
sqian
0acb1b7219 Verify there are no more current calls 
am: c8a08c1816

Change-Id: I3209c206b8299b2ecb7f6ec5df69dee2f643c743
 2019-07-31 11:51:30 -07:00
sqian
c8a08c1816 Verify there are no more current calls 
After disconnect calls, we want to verify there are no more current calls
by calling IRadio.getCurrenctCalls

Test: run vts
Bug: 138413412
Change-Id: Iacca49abff11fbdfb4ae6dd060a5f150e9e4a74d
Merged-In: Iacca49abff11fbdfb4ae6dd060a5f150e9e4a74d
(cherry picked from commit 5f68117e87)
 2019-07-30 16:29:33 -07:00
sqian
5f68117e87 Verify there are no more current calls 
After disconnect calls, we want to verify there are no more current calls
by calling IRadio.getCurrenctCalls

Test: run vts
Bug: 138413412
Change-Id: Iacca49abff11fbdfb4ae6dd060a5f150e9e4a74d
 2019-07-26 18:49:02 +00:00
Youming Ye
d005bbeb53 Add REQUEST_NOT_SUPPORTED to startNetworkScan 
Test: VTS
Bug: 137298570
Change-Id: I0afacd413d467c3e25585d6d5431278fd61a1562
 2019-07-22 18:34:56 -07:00
TreeHugger Robot
c69700441e Merge "Disable startNetworkScan tests with parameters." into qt-dev 2019-07-12 11:41:24 +00:00
Youming Ye
bc5f18aae1 Disable startNetworkScan tests with parameters. 
Network scan tests with parameters are disabled because of vendors
failed to fully implement startNetworkScan in HAL 1.4, and GSM rat scan
with parameters will get REQUEST_NOT_SUPPORTED error from modem.

Test: VTS
Bug: 137298570
Change-Id: I99df8495c5f654cb1420b7da36d7f5128ce14dbc
 2019-07-12 00:07:25 +00:00
sqian
1ade5556c8 Hang up EmergencyDial after Trigger in VTS 
am: 8c9947de8d

Change-Id: Ieeb5e62c4709c4288ebf956631851124caf90867
 2019-07-03 18:39:05 -07:00
sqian
8c9947de8d Hang up EmergencyDial after Trigger in VTS 
The whole test case run emergencyDial.RadioHidlTest_v1_4 first and then
 come after startNetworkScan.RadioHidlTest_v1_4 test case immediately
 (within ~3 secs) the NWscan failure is device in emergency call in
 progress/connected while doing emergencyDial.RadioHidlTest_v1_4 test

Although emergencyDial.RadioHidlTest_v1_4 only care about command/response
 is successful or not and don't care call is established or not, modem do
 care about call condition is in idle/progress/connected state before it
 can do NWscan

When there's dedicated channel established, modem can not perform AP
 request NWscan in parallel as we are single HW modem restriction.

Test: run vts
Bug: 135595082
Change-Id: Iecba54b93b96d33b57bc59e00f082ff133d2e57b
Merged-In: Iecba54b93b96d33b57bc59e00f082ff133d2e57b
(cherry picked from commit 07a53471c4)
 2019-07-01 17:37:24 -07:00
sqian
b2e7c71f39 Hang up EmergencyDial after Trigger in VTS 
The whole test case run emergencyDial.RadioHidlTest_v1_4 first and then
 come after startNetworkScan.RadioHidlTest_v1_4 test case immediately
 (within ~3 secs) the NWscan failure is device in emergency call in
 progress/connected while doing emergencyDial.RadioHidlTest_v1_4 test

Although emergencyDial.RadioHidlTest_v1_4 only care about command/response
 is successful or not and don't care call is established or not, modem do
 care about call condition is in idle/progress/connected state before it
 can do NWscan

When there's dedicated channel established, modem can not perform AP
 request NWscan in parallel as we are single HW modem restriction.

Test: run vts
Bug: 135595082
Change-Id: Iecba54b93b96d33b57bc59e00f082ff133d2e57b
Merged-In: Iecba54b93b96d33b57bc59e00f082ff133d2e57b
 2019-07-01 21:48:22 +00:00
Pengquan Meng
db5118bdad Merge "Send LTE|LTE_CA to modem in vts" into qt-dev 2019-05-24 01:28:16 +00:00
Pengquan Meng
2b3d7740fb Send LTE|LTE_CA to modem in vts 
Bug: 132057161
Test: vts
Change-Id: I963933aff316318053546b54ca680cb65e6a290a
 2019-05-23 21:56:59 +00:00
Pengquan Meng
806591aac8 Add Vts to enforce radioConfig is existed 
This vts enforce IRadioConfig is existed when IRadio service is supported.
We didn't add IRadioConfigV1.2, so in this test IRadioConfigV1.1 will be
checked.

Bug: 132379735
Test: atest VtsHalRadioV1_4TargetTest
Change-Id: I2062ed6b191193d9a8af4f25059fed6cc8dc09d8
 2019-05-22 15:03:32 -07:00
Amruth Ramachandran
7c06193d09 Add VTS test for getDataRegistrationState 
Bug:112194535
Test: VTS test

Change-Id: I32b335c8407a6884216aa1b80216a87e94b6cba6
 2019-04-01 10:17:07 -07:00
Jack Yu
7885653276 Added VTS tests for setDataProfile and setInitialAttachApn 
Test: VTS
Bug: 121345833

Merged-In: Ia7a260f5bbf9463c96b53656bcbe031af5208cbb
Change-Id: Ia7a260f5bbf9463c96b53656bcbe031af5208cbb
(cherry picked from commit 7948a04d01)
 2019-04-01 10:05:23 -07:00