Commit graph

776 commits

Author SHA1 Message Date
Mitch Phillips
96a768fc4d Merge "[MemInit] Use new MemInit API." am: 5daa3ab5e0 am: 87a946d883 am: b2bac598a9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1555757

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e062a704e6e82f05c79d43ca0968e65f46534ce
2021-02-02 01:28:19 +00:00
Mitch Phillips
13df2fafda [MemInit] Use new MemInit API.
The system property will only disable heap memory initialization. If you
want to disable MTE (which I don't think was the subject of the original
patch), you can use the MTE sysprops: 'arm64.memtag.process.<pname> =
"off"'.

Bug: 135772972
Test: Device boots.
Change-Id: I180be76ff2f776f1ec1a607de848ff6c81da852d
2021-01-29 10:19:48 -08:00
Treehugger Robot
2d23831d87 Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f95789e am: f977c1be53 am: fe1b7f038d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515921

Change-Id: I7e6164caa7a21721e182f4645ab73ac661639797
2020-12-04 01:36:58 +00:00
Yin-Chia Yeh
357e1dea20 Camera: fix HAL1 removeCamera crash
Test: partner testing
Bug: 173511749
Change-Id: Ifd5fc7c63e3835945194291d161b491bd5acb342
2020-12-03 10:07:34 -08:00
TreeHugger Robot
ba1b4cc839 Merge "VTS: Verify no duplicate entries between partial results" 2020-11-17 05:53:57 +00:00
Shuzhen Wang
6f906c15ab VTS: Verify no duplicate entries between partial results
Partial results are appended together. If there are duplicate entries
between partial results, there will be more than more entries for a tag
in the final result. This can cause undefined behavior, especially when
they have different values.

Test: Run Camera VTS test on Pixel devices
Bug: 170575182
Change-Id: I931660cef16a90ee0c247e3c4513a88adb7211ab
2020-11-16 11:11:59 -08:00
Treehugger Robot
29368c06d3 Merge "Camera: Expect physical results in the last partial notification" am: cecee13161 am: f026f3e5fe am: 5bb754093a am: 3ee6110e35
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1435036

Change-Id: I8dcaf8ccfc584c2ba6a53fee3eff06d8f1b6f80a
2020-11-13 21:52:52 +00:00
Treehugger Robot
cecee13161 Merge "Camera: Expect physical results in the last partial notification" 2020-11-13 20:45:34 +00:00
TreeHugger Robot
251697bd9b Merge "Merge ab/6749736 in stage." into stage-aosp-master 2020-10-13 03:31:34 +00:00
Steven Moreland
b900f5e78a Merge "camera 2.4: conditionally disable memory init" am: 6c6fd401a8 am: 8e69ad680f am: b9172fcc07 am: b088e60825
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1449141

Change-Id: Id2fefe8f9fae524b62e7b119528fa7cb96e3992c
2020-10-12 18:42:12 +00:00
Steven Moreland
b9172fcc07 Merge "camera 2.4: conditionally disable memory init" am: 6c6fd401a8 am: 8e69ad680f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1449141

Change-Id: Ibea6d3bce77764f5029a029dd19c8197f151b7e7
2020-10-12 17:42:06 +00:00
Xin Li
50393137ed Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I6756cad681e4cfa01868450214da0d7b2d5261e4
Change-Id: Ia529ecf4f48248d5af63673f359916486f71bc35
2020-10-08 23:22:52 -07:00
Steven Moreland
590f44eeed camera 2.4: conditionally disable memory init
This needs to be disabled on Pixel 3, but this is the only place w/
source code visible in AOSP. So, it is implemented as a mechanism.

Bug: 166675194
Test: atest android.hardware.camera2.cts.PerformanceTest
Change-Id: I0d91389432906a917696d27d27b4d6d96e64d09f
2020-10-05 23:45:34 +00:00
Dan Shi
2fdd0c5c39 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-29 06:52:28 +00:00
Dan Shi
97225977fb Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-28 22:16:14 -07:00
Dan Shi
f2b950f470 Rename vts-core to vts
Bug: 151896491
Test: none
Change-Id: If74547c56b46ebc7fd728c1bf52fe9dedac65ffa
Merged-In: I562b4dc50765e953800a814a8fd84a01c1b9352b
2020-09-26 04:11:28 +00:00
Emilian Peev
e33822c0d9 Camera: Expect physical results in the last partial notification
Per API specification the physical device capture results will only
be part of the last/final partial result notification.

Bug: 165476824
Test: adb shell
/data/nativetest64/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest

Change-Id: I0aa860b10ed2bd30c46f58ad0ee530c740f1f5d6
2020-09-23 16:10:11 +00:00
Treehugger Robot
e453d81dc8 Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38 am: ed6abddaf8 am: 12069ba334 am: 2b2b298116
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451

Change-Id: I3ef3aa622487517945bec335e123a0fe7e422005
2020-09-18 18:32:05 +00:00
Treehugger Robot
ed6abddaf8 Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577 am: 83a6256f38
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451

Change-Id: I2aa2077cffbbee18a0cd25acb46c3a8e0c4b6f14
2020-09-18 16:31:22 +00:00
NukemZHYu
5508e51c5c camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device
change (getCameraDeviceVersion(mProviderType, name) to (getCameraDeviceVersion(name, mProviderType)
Avoid Camera HAL 1 Device fail on Status(EX_TRANSACTION_FAILED): 'BAD_TYPE:

Bug: 168676352
Test: run commandAndExit vts -m VtsHalCameraProviderV2_5Target

Change-Id: Icb164538bbc357e22412a7320bb721c220c24a4c
2020-09-16 21:00:33 +00:00
TreeHugger Robot
c7ef8fe166 Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee02 am: 314611d129
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: I040deb56a223492e61eedce00464dbf94617aa88
2020-08-06 19:57:03 +00:00
TreeHugger Robot
c70f1c788b Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee02 am: 314611d129 am: 4181fe2378 am: 03a6282934 am: 7941bf02ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: I9dad2aacd376239427dd1a84c0e93132d5a55b9a
2020-08-06 17:23:28 +00:00
TreeHugger Robot
03a6282934 Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee02 am: 314611d129 am: 4181fe2378
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: I5dd4ed3ffb25a1f8c39f59e4cfe089d373b47e86
2020-08-06 16:48:03 +00:00
Dan Shi
ff985a85a8 Suppress gtest error for tests without any instance
Bug: 162052785
Test: m -j vts
Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
2020-07-29 09:46:36 -07:00
Jayant Chowdhary
ef9374cb20 Camera HAL Vts : Fix usage flag combination during gralloc allocation.
Earlier, for processCaptureRequestInternal, we took into account
producer and consumer usage flags returned by configureSingleStream.
Instead we should be taking into account the producer flag returned by
configureSingleStream and the consumer flag passed into
processCaptureRequestInternal (for output streams).

Bug: 162344072

Test: Use secure camera as secure only camera and run vts
Test: Run camera vts
Test: Vendor testing

Change-Id: I9fbd4db4cff48c25684f097907e7ba995c3edf41
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-07-28 19:18:00 +00:00
Jooyung Han
d18cba85fe update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
(cherry picked from commit b0907a6bb8)
2020-07-02 12:26:37 +09:00
Jooyung Han
b0907a6bb8 update hidl .bp
HIDL libs are not necessarily part of VNDK now. Because some are
used by VNDK libs, they are still VNDK. But rest are now just
vendor-available.

.hidl_for_test files are also removed because they are used to exclude
test-purpose hidl libs from VNDK libs.

Instead, .hidl_for_system_ext files are added to tests/lazy to
distinguish them from others which are installed /system.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Change-Id: Ia81312dda340b6b5cbdd7a3c21e1d323bda39a4a
2020-07-02 09:18:17 +09:00
TreeHugger Robot
f71ac1d192 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010 am: 7b04738823 am: 796dde65c0 am: e86af07958
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: I020045e2eb9cff3b4a0d6f9c830ae86c92c4c2fd
2020-06-30 19:01:11 +00:00
TreeHugger Robot
796dde65c0 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010 am: 7b04738823
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: I39f1402887c1009c99a62d8f71d1d187547b4fe8
2020-06-30 18:32:22 +00:00
TreeHugger Robot
59a28383f2 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12036144

Change-Id: Iba10324055f76a2f7990194c078fabde735b4544
2020-06-30 18:14:05 +00:00
TreeHugger Robot
ef7bf24010 Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev 2020-06-30 18:01:02 +00:00
Yin-Chia Yeh
f65225671c Camera: fix the VTS test timeout to be 30min
Test: test failure is gone
Bug: 159413657
Change-Id: Id1a350081241910463614960c6fdda3d7e32eddc
2020-06-29 09:45:03 -07:00
TreeHugger Robot
8087d5eb37 Merge "camera : Allow non bc camera devices through getConcurrentStreamingCameraIds" into rvc-dev am: f40dd0a7d0 am: 7887470eca am: 92721b1ce3 am: 3fe1e9e049
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11975963

Change-Id: I251b60fc0980412baf219f210d83701243f8aff7
2020-06-24 22:44:59 +00:00
TreeHugger Robot
7887470eca Merge "camera : Allow non bc camera devices through getConcurrentStreamingCameraIds" into rvc-dev am: f40dd0a7d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11975963

Change-Id: If33150977ba1a86745d56221b7272f2e948cff1d
2020-06-24 22:22:08 +00:00
Jayant Chowdhary
6a9a809e36 camera : Allow non bc camera devices through getConcurrentStreamingCameraIds
Also Add y16 stream combinations to configureConcurrentStreamsAvailableOutputs vts test

Bug: 159247271

Test: VtsHalCameraProviderV2_4TargetTest
      --gtest_filter=PerInstance/CameraHidlTest.configureConc* on
      cuttlefish

Change-Id: If5fea1fc47a3bcc8d3695e23f01a55091c246eda
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-06-24 12:42:49 -07:00
TreeHugger Robot
f7e3b8441d Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240 am: 21bb36aead am: fad2482bda am: 7e63b49db6
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022

Change-Id: Iaa8e527b9126f0851118087a15b434b4f9e349fb
2020-06-22 00:03:12 +00:00
TreeHugger Robot
fad2482bda Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240 am: 21bb36aead
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022

Change-Id: I2258e8b9b07a17938d08fd4e77c5986ca4954509
2020-06-21 23:39:08 +00:00
TreeHugger Robot
ec31161c48 Merge "Camera: Fix insensitive language in comments and names" into rvc-dev am: 7e5c3f0240
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11936022

Change-Id: Ie7223de56cc97de4cb6f6d358c8f2d448b44c257
2020-06-21 23:14:06 +00:00
TreeHugger Robot
7e5c3f0240 Merge "Camera: Fix insensitive language in comments and names" into rvc-dev 2020-06-21 22:53:20 +00:00
Eino-Ville Talvala
d6346872c6 Camera: Fix insensitive language in comments and names
Test: Builds
Bug: 159480149
Change-Id: Ic048071867b69e5c2d337f59f697980a6a64587f
2020-06-19 15:25:01 -07:00
TreeHugger Robot
eae4b81314 Merge "Camera: Allow HAL not call notify() with ERROR_BUFFER" into rvc-dev am: 3de961d7bf am: 37d5f941b5 am: 505d38d3de am: bd9c3091c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11906338

Change-Id: I0734a4e32d69907797acb042011be52590bc9128
2020-06-18 23:08:02 +00:00
TreeHugger Robot
505d38d3de Merge "Camera: Allow HAL not call notify() with ERROR_BUFFER" into rvc-dev am: 3de961d7bf am: 37d5f941b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11906338

Change-Id: Ifdc1244d8e0799f6fb603895686e5c3b05604243
2020-06-18 22:35:31 +00:00
TreeHugger Robot
8d3c76bf85 Merge "Camera: Allow HAL not call notify() with ERROR_BUFFER" into rvc-dev am: 3de961d7bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11906338

Change-Id: I73b11cbf5e3a71d7c6ef699233a15444573ed0e3
2020-06-18 22:16:16 +00:00
Shuzhen Wang
ce9d001076 Camera: Allow HAL not call notify() with ERROR_BUFFER
The new framework implementation derives capture buffer loss
notification from other information, and treats HAL notify() with
ERROR_BUFFER as no-op.

Test: Build
Bug: 155353799
Change-Id: Ia7ea52ee2750c7404b657467e1cfda4c05e6cc78
2020-06-17 23:34:16 -07:00
TreeHugger Robot
00f51f8684 Merge "Camera: add new VTS test config file" into rvc-dev am: 0e6850ee68 am: 34a3c1fe34 am: 0bebf33647 am: 1ffcb4d556
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11813664

Change-Id: I254bd9ecfae7df4d1d4382befb16c5fd48da70dc
2020-06-12 19:20:11 +00:00
TreeHugger Robot
0bebf33647 Merge "Camera: add new VTS test config file" into rvc-dev am: 0e6850ee68 am: 34a3c1fe34
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11813664

Change-Id: I4cf55c6dcf1de575142ebc3573e561b29bce2209
2020-06-12 18:48:42 +00:00
TreeHugger Robot
06579d8b6e Merge "Camera: add new VTS test config file" into rvc-dev am: 0e6850ee68
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11813664

Change-Id: I92b7a6553644ba3336597595f46ded6d45795519
2020-06-12 18:31:09 +00:00
TreeHugger Robot
0e6850ee68 Merge "Camera: add new VTS test config file" into rvc-dev 2020-06-12 18:09:29 +00:00
Jayant Chowdhary
5a6bd8f526 Merge "Add some updates to documentation regarding concurrent camera operation." into rvc-dev am: 416e3d94f9 am: 0bd046e46d am: 3c6f024e7e am: b7ae323c99
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11832204

Change-Id: I60b1706d19be4e8465649afe07b047d009e3da9d
2020-06-11 21:37:22 +00:00
Jayant Chowdhary
3c6f024e7e Merge "Add some updates to documentation regarding concurrent camera operation." into rvc-dev am: 416e3d94f9 am: 0bd046e46d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11832204

Change-Id: I19304757aad7fc766dd33544160486ddf4fa2ad9
2020-06-11 21:01:47 +00:00