Commit Graph

5608 Commits

Author SHA1 Message Date
TreeHugger Robot
76005410a4 Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev am: 0558b51322 am: 36b94109da am: 857d672870 am: 0fac51e975
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870021

Change-Id: I488699d6c8e4adb2a6b513cc52b081aab05f85ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 05:00:07 +00:00
TreeHugger Robot
0fac51e975 Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev am: 0558b51322 am: 36b94109da am: 857d672870
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870021

Change-Id: I5b746e75b64359cbcbbb20588c19d3848d0f0ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 04:37:27 +00:00
TreeHugger Robot
857d672870 Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev am: 0558b51322 am: 36b94109da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870021

Change-Id: I362d34435ab91710166e1097bf3d16d3c592bc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:54:12 +00:00
TreeHugger Robot
36b94109da Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev am: 0558b51322
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870021

Change-Id: I9d568bfb8c0203d15ce146c0592611e12297a04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 03:36:48 +00:00
TreeHugger Robot
0558b51322 Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev 2022-06-14 03:16:43 +00:00
Emilian Peev
8b14b7f662 Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6 am: 5ea3dfe752 am: da8ee7b52a am: 87839ae36b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658

Change-Id: I88847b22180ad4adef1a6a05cc51b96663720ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:05:38 +00:00
Emilian Peev
87839ae36b Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6 am: 5ea3dfe752 am: da8ee7b52a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658

Change-Id: I44d613aa1c20d4cc34f7dafe4475a1269de4a680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 22:44:30 +00:00
Emilian Peev
29a9bf7f85 Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6 am: 53b01eb303
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658

Change-Id: Id4bc3cea32f57dd893c27d0977771ea8b38213ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 22:10:07 +00:00
Emilian Peev
da8ee7b52a Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6 am: 5ea3dfe752
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658

Change-Id: Ia5f97ccfb2f2544265d3f70d4b537d8db704651d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 22:01:30 +00:00
Emilian Peev
53b01eb303 Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658

Change-Id: I3eb898b1001a34db4d315ca7bc44a607acd927a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 21:51:53 +00:00
Emilian Peev
5ea3dfe752 Merge "Camera: Allow synthetic extension metadata" into tm-dev am: eb177cd5d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18801658

Change-Id: I8ddd4eb83fbb0e2c7bdfb2a3c5262445290866ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 21:50:42 +00:00
Emilian Peev
eb177cd5d6 Merge "Camera: Allow synthetic extension metadata" into tm-dev 2022-06-13 21:29:03 +00:00
Shuzhen Wang
e07c69bfde Camera: Update streamConfigurationMap doc for JPEG sizes
Update the developer doc for reduced set of supported JPEG sizes
depending on media performance class level.

Also fix some broken links in developer doc.

Test: Build
Bug: 235804659
Change-Id: Iab3be52d13f02a19cc62732dcdf46feb576e0095
2022-06-13 14:09:58 -07:00
Michael Wright
9dde92b70e Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev am: f029d8cf1b am: a8bbf1c04c am: 87f14f06ac am: d1fb73f4fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799664

Change-Id: I53b944e712b60fcff450b2f5669535cb27b1f1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:57:14 +00:00
Michael Wright
d1fb73f4fd Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev am: f029d8cf1b am: a8bbf1c04c am: 87f14f06ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799664

Change-Id: I3e9e435c0d2707a5e19bbfcf7ce79bb8c7818dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:24:09 +00:00
Michael Wright
924d63481c Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev am: f029d8cf1b am: 4f89921b4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799664

Change-Id: I3c2b7052d5d91dc0f5aa2f1c3eb93efa40cfcbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:16:01 +00:00
Michael Wright
87f14f06ac Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev am: f029d8cf1b am: a8bbf1c04c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799664

Change-Id: I643ca5c6df5ffba66d78284e0ceb6495f5bd9d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 20:07:18 +00:00
Michael Wright
4f89921b4a Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev am: f029d8cf1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799664

Change-Id: Ia26667a9b7d0d79d69496acd37857b48b4e2cda0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:48:22 +00:00
Michael Wright
a8bbf1c04c Merge "Revert "Revert "Do not send updates for disabled displays.""" into tm-dev am: f029d8cf1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799664

Change-Id: Icb612ca3d0051a88de833dac1008140902194868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 19:46:30 +00:00
Michael Wright
ce5906b4a1 Revert "Revert "Do not send updates for disabled displays.""
This reverts commit d04fae1ba7.

Reason for revert: Robolectric fixed

Change-Id: Idfba84d5aefb694f9af77a1d4f1a648e01e282b4
2022-06-13 11:08:32 +00:00
Sam Dubey
0934c6c383 Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f85 am: 525a41a6db am: 53ff5b141e am: cf54f8f4ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803234

Change-Id: Id3b83476afe31bd5186c11bd2750fa9911750a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:10:23 +00:00
Sam Dubey
cf54f8f4ec Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f85 am: 525a41a6db am: 53ff5b141e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803234

Change-Id: Ieb219f62be432b4e0b5ccecb67320723c271964d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:34:01 +00:00
Sam Dubey
53ff5b141e Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f85 am: 525a41a6db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803234

Change-Id: I85e89210aedbbd98b1dc8038c8cc1915cf2ea4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:03:34 +00:00
Sam Dubey
afb3de7bc7 Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f85 am: 525a41a6db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803234

Change-Id: Ie63c70c372f8de5916d6c392c59e129a9f12b852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:02:05 +00:00
Sam Dubey
525a41a6db Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803234

Change-Id: Ide0cddaef2914222fbea373abcb2d517e50edbe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 06:47:39 +00:00
Sam Dubey
af193e8b8c Merge "Revert "Do not send updates for disabled displays."" into tm-dev am: 54e0824f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803234

Change-Id: Iad033af25def1c56945567e8742a4aceb2d00893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 06:46:33 +00:00
Sam Dubey
54e0824f85 Merge "Revert "Do not send updates for disabled displays."" into tm-dev 2022-06-10 05:51:43 +00:00
Sam Dubey
d04fae1ba7 Revert "Do not send updates for disabled displays."
This reverts commit 3175300106.

Reason for revert: Breaking roboelectric suw tests with an NPE accessing displayids() in shadowdisplaymanager

Bug: 235541208
Change-Id: Ib760b5b9a477eb3c8516f01614afe8192a6e597b
2022-06-10 04:38:26 +00:00
TreeHugger Robot
8a865cf05f Merge "Do not send updates for disabled displays." into tm-dev am: ad3c32bff1 am: 627bbbe717 am: c0d2c1c48b am: 980c0b204f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17245703

Change-Id: Id0c9c976894f53d9077e560bb0c82b4570c1e434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 01:19:42 +00:00
TreeHugger Robot
980c0b204f Merge "Do not send updates for disabled displays." into tm-dev am: ad3c32bff1 am: 627bbbe717 am: c0d2c1c48b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17245703

Change-Id: Idc26bc173f19d904e2a92fd00efda22025f2561d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 01:01:30 +00:00
TreeHugger Robot
c0d2c1c48b Merge "Do not send updates for disabled displays." into tm-dev am: ad3c32bff1 am: 627bbbe717
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17245703

Change-Id: I5f20fab9786a0df3a0cdfac0d72799c2df18222f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 00:35:04 +00:00
TreeHugger Robot
01f56fcf25 Merge "Do not send updates for disabled displays." into tm-dev am: ad3c32bff1 am: 978fe93fed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17245703

Change-Id: Iac134816d6c2109ddf7fd14cece018f1aca799c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 00:26:04 +00:00
TreeHugger Robot
627bbbe717 Merge "Do not send updates for disabled displays." into tm-dev am: ad3c32bff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17245703

Change-Id: Iccc9059b93b53ff6443c7ee1a970c06e97e81223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 00:10:02 +00:00
TreeHugger Robot
978fe93fed Merge "Do not send updates for disabled displays." into tm-dev am: ad3c32bff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17245703

Change-Id: I7644ba09a1d62d77eb79dc6ac34d0b14e6271a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 00:08:25 +00:00
TreeHugger Robot
ad3c32bff1 Merge "Do not send updates for disabled displays." into tm-dev 2022-06-09 23:45:39 +00:00
Santos Cordon
3175300106 Do not send updates for disabled displays.
If a display is disabled, do no share it outside of
LogicalDisplayMapper.

This will help by not creating unnecessary updates for displays that
are disabled.

Bug: 197515205
Bug: 221071695
Test: atest com.server.android.display
Test: Manually verify display layouts still successfully change, and
      also that confirm logs no longer have excessive add/remove
      display notifications.
Change-Id: Ie5954935bb1afc612935e52d421b0e103d8d0854
2022-06-09 13:37:59 +00:00
Emilian Peev
cbd3739167 Camera: Allow synthetic extension metadata
Synthetic metadata such as 'STATISTICS_FACES'
could be of value to extension clients.
Allow extension implementations to advertise support
for synthetic keys.

Bug: 235330843
Test:
atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java
atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: I80133e4559610ecad714afa93400c00b2b6685fa
2022-06-08 14:13:56 -07:00
TreeHugger Robot
ceb0aee261 Merge "Add prefix to newly introduced IntDef for DEPTH" 2022-06-08 15:40:54 +00:00
Sally Qi
0b92887bac Add prefix to newly introduced IntDef for DEPTH
Bug: 235218604
Test: builds
Change-Id: I0f362ef0306f881155513aa91238eb00ac8e22ea
2022-06-07 11:04:04 -07:00
TreeHugger Robot
6e18e21596 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68 am: 0e85d31190 am: 71c07629ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: I7b10a8f1728ce614ef4ed397ed63c01f5ae92f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:52:26 +00:00
TreeHugger Robot
dcf650285e Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68 am: a6cc576b31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: Iba8847d02b485d1a8820ca8670a552201dde9fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:38:30 +00:00
TreeHugger Robot
71c07629ca Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68 am: 0e85d31190
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: I9a35334927540625871b82fcb8b57c3299c428e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:31:37 +00:00
TreeHugger Robot
17c48787bc Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68 am: 1ba0219c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: Iae9f0c2a69c1644a64e28fce1827c5459a66f32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:30:53 +00:00
TreeHugger Robot
a6cc576b31 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: Ib41f70c6c5488d6d169a364cc5639d842ca1724e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:14:57 +00:00
TreeHugger Robot
0e85d31190 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: I1391e5ac4a6bb5ad480ebab9a154831db5fb8b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 18:13:14 +00:00
TreeHugger Robot
aedd857b68 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev 2022-06-03 17:59:53 +00:00
Sally Qi
8893a3b626 Add Depth into DataSpace API.
Bug: 205034862
Test: builds
Change-Id: Ie859fc46a553df03819250f9f7f8408bbacc43f2
2022-06-02 12:55:49 -07:00
Sally Qi
e51d2fa4e7 Merge "Add DATASPACE_BT2020_HLG into DataSpace API." 2022-06-02 19:28:33 +00:00
Sally Qi
6541a05325 Add DATASPACE_BT2020_HLG into DataSpace API.
Bug: 231727035
Test: builds
Change-Id: Ie2f5f61f2bda3bfb5bf02a2bb91d5e14d931aabf
2022-06-01 18:49:51 -07:00
Lei Ju
acd7649901 Add nanoapp messasge records into dump.
Test: manually run `adb shell dumpsys contexthub` and GTS test
ContextHubSendMessageToHostNanoAppTest. Pass.
Bug: 233889535

Change-Id: Icf46a0de8714343efeb605ee80777b85cfa14414
2022-06-01 15:28:04 -07:00