Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
770,693 Commits 3 Branches 0 Tags
ff46cdd950c5f89bf7770cec19ddbbec7732b291
Commit Graph

5470 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
aedd857b68 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev 2022-06-03 17:59:53 +00:00
Antony Sargent
eb38d231bc Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: de2d849abd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ie72dc45b6f7f5e55876cf8798553712db36f6b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:59:09 +00:00
Antony Sargent
de2d849abd Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: If653afb4a286de6046e9bf4392a2fa924de5c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:35:54 +00:00
Antony Sargent
725dad7d71 Prevent deadlocks during VirtualDisplay creation 
When creating a VirtualDisplay for a VirtualDevice, we need to do some
extra work like setting up for input injection, creating a
DisplayWindowPolicyController, and grabbing a wakelock to keep the
display awake. Some parts of this extra work end up calling back into
the DisplayManagerService from another thread, but since we're already
holding the mSyncRoot lock we sometimes get into situations where
those threads get blocked trying to acquire mSyncRoot, while holding a
lock that another thread ends up needing like the global window
manager one, so we get deadlock.

The fix in this CL is to break up the extra work the
VirtualDeviceManagerService needs to do into two parts: one part that
happens before the VirtualDisplay is created, and one part
after. Neither of these needs mSyncRoot to be held.

Fixes: 230544802
Test: atest CreateVirtualDisplayTest
Change-Id: I6a6e03f816567579510b3f1ef0705375549a3c88
 2022-05-29 11:18:36 -07:00
Santos Cordon
1fe8fe5b7b Logging for DisplayPowerController SuspendBlockers 
Bug: 213407479
Test: Manually verify via 'adb shell dumpsys display'
Change-Id: I2948319fc0354adf6e25b30ca11654c368c1e1d5
 2022-05-28 17:13:20 +00:00
TreeHugger Robot
560421a8c0 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 am: c8571df946 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313

Change-Id: Ia5e508629fb4aba9d7ce60287e0f2d627b0e9a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:19:29 +00:00
TreeHugger Robot
c8571df946 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313

Change-Id: I7d8ed0e3dd91a8c0bd54868de5333f63d2268fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:01:12 +00:00
TreeHugger Robot
d5b0c3f163 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev 2022-05-25 02:40:34 +00:00
Emilian Peev
adbbd77689 Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev am: f25e9aec2a am: be108d910c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18192278

Change-Id: I7685cd04307f866112cebf60d31da7f1d26d490c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:35:11 +00:00
Emilian Peev
be108d910c Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev am: f25e9aec2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18192278

Change-Id: I7d72a960a3ef9480f2d357aac08d54e6aed4422f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:25:30 +00:00
Emilian Peev
f25e9aec2a Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev 2022-05-24 22:20:42 +00:00
Santos Cordon
3be5498e61 Add ALL_INCLUDING_DISPLAYS category for getDisplays() 
Add a category for DisplayManager#getDisplays() that includes
disabled/inaccessible/temporary displays in the set of returned
Displays.

Bug: 221071695
Test: adb shell cmd display get-displays \
      android.hardware.display.category.ALL_INCLUDING_DISABLED
Change-Id: If06f7f8b7f9ba4779a19d24d76fb49e95a908afc
 2022-05-20 11:27:45 +00:00
TreeHugger Robot
f5a4b7fd86 Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f am: 02afba9572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: I4e7280b4493b9f602e5469125302dbe2dc596978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:50:52 +00:00
TreeHugger Robot
02afba9572 Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: Ie13675a43f0ddf29f926292fb2813508d890b583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:24:55 +00:00
yuanjiahsu
fc06fc5cb1 Defines flag to disable touch feedback on display 
Define FLAG_TOUCH_FEEDBACK_DISABLED to disable touch sound and haptic feedback when creating virtual display.

Bug: 185558698
Test: atest FrameworksCoreTests:ViewRootImplTest, manual testing
Change-Id: Ida67f4027f2636e004218595b3bf088c06194522
 2022-05-19 06:01:55 +00:00
TreeHugger Robot
f3b2486f1d Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 am: 936834e3b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: I44df8872c2032b93612b4ece954335f39b0aa623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:15:19 +00:00
TreeHugger Robot
936834e3b5 Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: If1a8c3eccb6676f891a7e8742b49aacdaccfddb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:33:08 +00:00
Shuzhen Wang
23767f998d Camera: Add videoStabilizationMode to Camera session stats 
Test: ./out/host/linux-x86/bin/statsd_testdrive 227
Bug: 224639088
Change-Id: I2a7b0965662b729585d0aa6e6a1e6407e448ddfe
 2022-05-17 14:20:53 -07:00
Prabir Pradhan
a2436c7ed1 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 am: 978c20b808 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I6e6cf0c853f048e1fb769511933d6dc14cb72e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:28 +00:00
Prabir Pradhan
978c20b808 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I91801a48d0c935f990b71216c4ece2bd0ba29f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:15:48 +00:00