Commit Graph

5559 Commits

Author SHA1 Message Date
TreeHugger Robot
6f988c39c5 Merge "Remove SoundTriggerMiddleware death notification" into tm-qpr-dev am: ee9494914b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19668917

Change-Id: I16b18ee3086f1d249da3f490bef7899a2e81a5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 20:42:23 +00:00
Atneya Nair
e6ac0c57d7 Remove SoundTriggerMiddleware death notification
The death notifier for the middleware service is unnecessary
- We don't use mService elsewhere (nor check its nullity)
- We re-query the service upon each call

Additionally, creating a new death notifier on each query is redundant,
and results in memory leaks (since each notifier takes state, and we
never unlink to death).

Test: Compiles
Bug: 237968209
Change-Id: Ib53ec65235d4284357e0f6649bb6f65b2de83b99
2022-08-18 18:04:07 +00:00
Jayant Chowdhary
4bcb7914b8 Merge "Fix spacing for preview stabilization mandatory streams docs." into tm-qpr-dev am: 23ac6aceca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19572800

Change-Id: Ibe4864a2f0b239f0ff8d3d642dbe5da01bfb0186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 17:42:54 +00:00
Jayant Chowdhary
b723541a6e Fix spacing for preview stabilization mandatory streams docs.
Bug: 237717894

Test: Check output of make doc-comment-check-docs

Change-Id: Ia389f18746fd6c4c534a87ae6ad89261bdd8cc3a
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-08-10 00:10:37 +00:00
TreeHugger Robot
3d698aabaa Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 am: 5c002a64a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I980d941daf2be5aef08b9695e993dbb76edffc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:59:25 +00:00
TreeHugger Robot
5c002a64a5 Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689

Change-Id: I7d641cea03f9f35889d0ebdcf66e9bf7a0f35609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 17:51:59 +00:00
Emilian Peev
671d613bcb Camera: Avoid NPE when extension results are not supported
Bug: 240017175
Test: atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java#testRepeatingAndCaptureCombined
Change-Id: I0b82039a103ac2a55f71a6aea505d7c7c696d7be
2022-07-27 22:46:59 +00:00
Rucha Katakwar
81d5ed723b Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02 am: 77f3fe5709
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: I8cc7c95e80e21ad68847b749dd9f0b0d36bbf27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 19:00:10 +00:00
Rucha Katakwar
77f3fe5709 Merge "Update torch brightness max level description." into tm-d1-dev am: 7cdfd75b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19386567

Change-Id: Idc09acf8b2b185f873b45b7bad70e0a32fab5ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 18:37:45 +00:00
Rucha Katakwar
7cdfd75b02 Merge "Update torch brightness max level description." into tm-d1-dev 2022-07-27 18:14:04 +00:00
Joshua Mccloskey
315f6f124d Merge "SideFPS UX updates" into tm-qpr-dev am: 2ff2a64cfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19039844

Change-Id: I0e5645ff7a507ebd9c8c29f347ed6e45f3f365d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 20:56:14 +00:00
Joshua Mccloskey
2ff2a64cfe Merge "SideFPS UX updates" into tm-qpr-dev 2022-07-26 20:34:50 +00:00
Jayant Chowdhary
aaee5102db Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4 am: 8023620746
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: I89cabe4d6c8c7afe2695d46f7f8dafc800497dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:13:50 +00:00
Jayant Chowdhary
8023620746 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: Iaf4d48ea9d31b053f78f788e0f651b7ba1c5c8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:06:35 +00:00
Rucha Katakwar
851d5cf44b Update torch brightness max level description.
Bug: 239492786
Change-Id: I9514a3d137a64f99e3c5c03d1843b53ace0cbf3a
2022-07-21 14:03:50 -07:00
Jayant Chowdhary
138fc75ad4 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev 2022-07-21 20:41:45 +00:00
Rucha Katakwar
e4d719e90f Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc am: 7095b9c34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Id0e9868bfd839ed5ee5768556c659f1c287b3067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 00:03:58 +00:00
Rucha Katakwar
7095b9c34d Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: I6c31a737c549916c5f81f45191f9949367f60eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:47:48 +00:00
Rucha Katakwar
727b4386db Merge "Update torch brightness max level description." into tm-d1-dev am: 88949ab1fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340523

Change-Id: Id2ddfe491e9f75e9f2e1818bf48f26e369234e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 23:47:39 +00:00
Jayant Chowdhary
cff610bf0e camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position
When we use any of the viewed methods from ByteBuffer such as
asFloatBuffer, the returned buffer's position and the original
ByteBuffer's positions are independent. So update the original
ByteBuffer's position as well, for correct accounting.

Bug: 239639757

Test: Camera CTS; GCA
Test: MarshalQueryableArray error logs don't appear in logcat while using GCA

Change-Id: I488a23c278ee5d044c2423a616e598a93cbbad0b
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-07-20 18:33:45 +00:00
Joshua McCloskey
2987c8b264 SideFPS UX updates
1. Added side fps auth delay on device entry/biometric
prompt to wait for power press.
2. Added tap to dismiss dialog for side fps enrollment.

Test: atest SideFpsEventHandlerTest
Bug: 233953696
Change-Id: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
Merged-In: I1b8a63cc76cdb5d8e46206ba1bee8fc3246a8cdc
2022-07-20 17:02:29 +00:00
Rucha Katakwar
a5bd39561a Update torch brightness max level description.
Bug: 239492786
Change-Id: I01720f2d25b932d58fa8b7816f8504101d70f3a3
2022-07-19 16:50:25 -07:00
Jayant Chowdhary
410013d8a0 Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7 am: 2f824d9426
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Ia3f26ef93c439fbf58a92ce2b2daab90318c2fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 15:52:58 +00:00
Jayant Chowdhary
7057d372ad Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Ic70c6b733132182fba2b984b0a80296b80cc46b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 15:37:40 +00:00
Jayant Chowdhary
2f824d9426 Merge "camera2: use bulk get methods while unmarshalling primitives." into tm-d1-dev am: c5a041d4c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19303234

Change-Id: Ic9bd7f09a84b2e873e6cc00e2f77ab321c8f1f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 15:37:39 +00:00
Weilin Xu
f731308ceb Merge "Fix purge bug for program list update" into tm-qpr-dev am: 8f70a3a4ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19245921

Change-Id: I108fc9d830d7705806f42f094ad9137a7cbc2438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-18 18:28:14 +00:00
Jayant Chowdhary
f0f7a7cabf camera2: use bulk get methods while unmarshalling primitives.
Bug: 239167817

Test: GCA (validity)
Test: Camera CTS
Test: profiling results mentioned in b/239167817

Change-Id: I6954a81d49be6d8a0746301e544b1772444ee746
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-07-15 19:40:29 +00:00
Weilin Xu
db8579ffd0 Fix purge bug for program list update
Fix the bug that using keySet and removing items of mPrograms at
the same time during program list update

Bug: 238199883
Test: atest android.hardware.radio.tests.functional
Test: atest com.android.server.broadcastradio.hal2
Change-Id: Ie958b3686780de8c6f3b9912c71dcfe7c07befd0
Merged-In: Ie958b3686780de8c6f3b9912c71dcfe7c07befd0
(cherry picked from commit 92a2339b7b)
2022-07-13 16:37:31 +00:00
Avichal Rakesh
573c527843 Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: Ib70238ad7e850cad5666a66c2a6f29353d58cf0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-08 20:52:26 +00:00
Avichal Rakesh
6bb32af31b Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022 am: f7be5a5d08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: Ib920a44f3fee261e5511978ed0a2107dd0c5b43a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 22:57:47 +00:00
Avichal Rakesh
f7be5a5d08 Merge "camera: Fix exception handling from ImageReader#detach" into tm-d1-dev am: 00d8fb5022
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19139699

Change-Id: I1a8dd18f1fc9ea044296a16bd80ea4a8da38090d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 22:38:58 +00:00
Avichal Rakesh
a9d512bef1 camera: Fix exception handling from ImageReader#detach
ImageReader has a bug where if detaching an Image from Surface fails, it
might throw a RuntimeException instead of an IllegalStateException as
stated in the javadoc. This can lead to CameraExtensionSessionImpl
crashing due to the unhandled exception. Changing ImageReader behavior
is difficult as it might break backwards compatibility.

To prevent crashes from expected exception, this CL adds exception
handling for RuntimeException when detaching images.

In addition, CameraExtensionSessionImpl caught generic `Exception` at
another place, which can lead to it consuming unintended exceptions.
This CL scopes in the exception handling to consume expected exceptions
only.

Bug: 236825255
Test: CtsCameraTestCases pass on Flame
Change-Id: I6fa81b7a19fb4017480074e33b09942aedcd2212
2022-07-01 11:42:22 -07:00
Weilin Xu
e5e456e97f Merge "Fix deadlock due to callbacks in ProgramList" into tm-qpr-dev am: 5355bffe3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19120223

Change-Id: I6635f3da3bdaddf105dba7329314920472990709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:23:30 +00:00
Weilin Xu
b5c6901c67 Fix deadlock due to callbacks in ProgramList
Copy callback member variables in ProgramList and call them after
releasing the lock of ProgramList, avoiding acquiring lock in
RadioAppService after already locking ProgramList, which causes
deadlook.

Bug: 193041795
Test: m -j
Test: atest android.hardware.radio.tests.functional
Test: atest com.android.server.broadcastradio.hal2
Change-Id: I196377ea030248a5d66a4db03ffb3bee4a70e633
Merged-In: I196377ea030248a5d66a4db03ffb3bee4a70e633
(cherry picked from commit 4ca33d655a)
2022-06-29 18:30:11 +00:00
Treehugger Robot
ec4376adee Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5 am: 0ee5cd13f9 am: da0078713c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I48039797c983ef04d2c4b5714ba57128c704a11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 09:18:15 +00:00
Treehugger Robot
da0078713c Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5 am: 0ee5cd13f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I66b1715120e1c0597196a75d61fb50d62f31387f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 08:55:33 +00:00
Treehugger Robot
0ee5cd13f9 Merge "CEC: Do not allow null callback" am: a36bae6e00 am: 4a6e08d4b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2134302

Change-Id: I0923d607a1aa766ba46d4f159b2d060ec37c66fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 08:32:17 +00:00
Venkatarama Avadhani
d9b319e0d2 CEC: Do not allow null callback
Do not allow oneTouchPlay and getDisplayStatus methods to be called
with null callback as an argument.

Bug: 236687418
Test: None
Change-Id: I9f1b3ec5c1a44fd588068881febd35d34930f031
2022-06-29 07:17:49 +00:00
Weilin Xu
aa60c6a20f Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13 am: db809e7990 am: 96b02b8b6f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: Ic2bae518081d8f3011536308ebf22c7127432fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 20:02:31 +00:00
Michael Wright
b0c536ee88 Merge "Brightnessthrottler updateable through DeviceConfig" into tm-qpr-dev am: c5f1c156ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18740932

Change-Id: I28ff59074b53bf8c5c06e7054a4d9831ac61bbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:27:05 +00:00
Weilin Xu
96b02b8b6f Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13 am: db809e7990
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: I44ac2938655e5b5d24ce18870a0761c5cc85a918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 20:04:27 +00:00
Weilin Xu
db809e7990 Merge "Added new owner to radio service folder" am: 0948b77d4f am: 5d38f81f13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2133941

Change-Id: I77d17f37da0fffad766e57d481d22880e98e3de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24 19:42:06 +00:00
Fiona Campbell
265f9a6c9c Brightnessthrottler updateable through DeviceConfig
Add listener and methods to allow BrightnessThrottler to be updated
though DeviceConfig.

Bug: 224567082
Test: atest com.android.server.display
Test: adb shell device_config put display_manager
brightness_throttling_data
"local:4619827677550801152,3,moderate,0.5,severe,0.379518072,emergency,0.248995984;local:4619827677550801151,1,moderate,0.75;local:4619827677550801150,0"
adb shell dumpsys display | grep -A20 BrightnessThrottler

Change-Id: If4fe4875d6a05cb03fbf69abb8a62a645098b3a0
2022-06-24 14:51:33 +00:00
Weilin Xu
de57566c98 Added new owner to radio service folder
Bug: 232461611
Test: m -j
Change-Id: I41c9bb1d0fd554e0f598223f8cbf013776275d39
2022-06-23 22:39:02 +00:00
Jayant Chowdhary
9848681859 Merge "Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD)." into tm-dev am: f0094b8dd3 am: 06086bee8e am: 47e6eeecdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18704183

Change-Id: I4a96b3a15aac147542ce9eddc4c867bfea7e276a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:27:33 +00:00
Jayant Chowdhary
b2918b14a7 Merge "Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD)." into tm-dev am: f0094b8dd3 am: 06086bee8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18704183

Change-Id: Icf8348f8c54af9a1741f17a8edef8c5b221f2499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:04:57 +00:00
Jayant Chowdhary
47e6eeecdc Merge "Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD)." into tm-dev am: f0094b8dd3 am: 06086bee8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18704183

Change-Id: I89b5c51afb26e89e5846cf5a7073564340646aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 22:04:52 +00:00
Jayant Chowdhary
06086bee8e Merge "Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD)." into tm-dev am: f0094b8dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18704183

Change-Id: I17b3850de21c4b35e5e447e5faa1b03adedae9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:36:47 +00:00
Jayant Chowdhary
cc8cc7b5dc Merge "Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD)." into tm-dev am: f0094b8dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18704183

Change-Id: I46e6acc6d252c65abbd8dac72720e1e721dac3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:35:34 +00:00
Jayant Chowdhary
f0094b8dd3 Merge "Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD)." into tm-dev 2022-06-17 21:35:12 +00:00