Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
787,678 Commits 3 Branches 0 Tags
4ab2bc56dd92e232fbdcfd1f59dc60a7cd463dcc
Commit Graph

5530 Commits

Author SHA1 Message Date
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
Jayant Chowdhary
d83e9b5325 Limit preview stabilization mandatory stream sizes to 1440p (instead of RECORD). 
Also fix a logic error in an if check while retrieving mandatory streams
for preview stabilization. This was not caught by CTS since for devices
where preview stabilization was supported, skipped the test. A
modification has been made to CTS RobustnessTest to ensure that the
preview stabilization support and mandatory streams are in agreement
with each other.

Bug: 228245412

Test: atest RobustnessTest.java on device supporting preview stabilization

Change-Id: I18c7f3c728862866b8f088da3afe222afbad7051
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2022-06-17 17:18:29 +00:00
Alex Chau
1df9c6103a Merge "Revert^2 "Revert "Do not send updates for disabled displays.""" into tm-qpr-dev am: 054aae3db4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18910047

Change-Id: Ic1523d281751b122867a6d483e6212bb59cc0030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 14:32:26 +00:00
Alex Chau
937ca4b396 Revert^2 "Revert "Do not send updates for disabled displays."" 
Bug: 221071695
Reason for revert: b/235889652
Reverted Changes:
I966d2c07d:Update IDisplayManager proxy.
Idfba84d5a:Revert "Revert "Do not send updates for disabled d...
Change-Id: I8c6c23bbf0c41aaeb576ad2917759fe8d782d02f
 2022-06-15 10:16:57 +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
76945bd9bb Merge "Camera: Update streamConfigurationMap doc for JPEG sizes" into tm-dev am: 0558b51322 am: 7165c7e54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18870021

Change-Id: Id44ad95d0c8e2fc7bb37bce054aa10425037f411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 03:54:22 +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
7165c7e54a 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: I59213c17d98644b70de1e7172a053de2488d2839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-14 03:35:17 +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
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
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
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