Commit Graph

5789 Commits

Author SHA1 Message Date
Weilin Xu
d2926a1ee0 Merge "Fix secondary ids comparison in strictEquals" 2022-10-06 00:31:11 +00:00
Jayant Chowdhary
e6702e96b9 Merge "camera2: Add non burst sizes to mandatory streams for ultra high resolution sensors" am: 74ab3f4974 am: 65915a087c am: 287fce0ea9 am: bb83ecf667 am: b8f6f69b81
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237375

Change-Id: Ia40192206961fb72702d31c36603f4e07049f84d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 18:43:56 +00:00
Jayant Chowdhary
b8f6f69b81 Merge "camera2: Add non burst sizes to mandatory streams for ultra high resolution sensors" am: 74ab3f4974 am: 65915a087c am: 287fce0ea9 am: bb83ecf667
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237375

Change-Id: I53a41b78cf65f1c7e6ca460f50d0e33b5edb5438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 18:40:26 +00:00
Jayant Chowdhary
bb83ecf667 Merge "camera2: Add non burst sizes to mandatory streams for ultra high resolution sensors" am: 74ab3f4974 am: 65915a087c am: 287fce0ea9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237375

Change-Id: I29a21567eeacb834eaabe65f39a5b1620d60388d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 18:11:37 +00:00
Weilin Xu
93fe39ef92 Fix secondary ids comparison in strictEquals
Since the comparator of identifer is not implemented, secondary
ids cannot be sorted in ProgramSelector constructor. Two secondary
id arrays should be compared using list in strictEquals method.

Bug: 249616039
Test: atest ProgramSelectorTest#
strictEquals_withDifferentSecondaryIdsOrders_returnsTrue

Change-Id: I2460c4399ff8564b638254f71e9d7c883868854a
2022-10-05 01:24:54 +00:00
Jayant Chowdhary
9ba6398d1d camera2: Add non burst sizes to mandatory streams for ultra high resolution sensors
Bug: 240128812

Test: Vendor testing
Test: RobustnessTest.java on cuttlefish

Change-Id: I92047456a43d49c5354718ead10df2cbd60363e2
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2022-10-04 21:10:10 +00:00
Prabir Pradhan
b9cd74abc1 Merge changes from topic "aidl-iinputdevicebatterystate"
* changes:
  Rename MonitoredDeviceState to DeviceMonitor
  Add AIDL definiton for IInputDeviceBatteryState
2022-09-30 12:40:39 +00:00
Vincent Wang
a37cf9541a Merge "Redesign Biometric API to be transactional" 2022-09-30 07:39:51 +00:00
Chavi Weingarten
98813294a0 Merge "Move MediaProjectionGlobal API to DisplayManager" 2022-09-29 13:30:08 +00:00
TreeHugger Robot
d87d7a8d4f Merge "Revert "CEC: Remove HdmiControlManager#mLocalPhysicalAddress variable"" 2022-09-29 10:19:37 +00:00
Vincent Wang
8b32d01703 Redesign Biometric API to be transactional
BUG: 243749335
Test: 1. atest biometrics-jank
         atest PlatformScenarioTests:BiometricPromptAuthIdTest
      2. Enabled VHAL manually & atest PlatformScenarioTests:BiometricPromptAuthIdTest
Change-Id: Id550aff6e41bab76116a0cf000e27d9dea797960
2022-09-29 17:04:23 +08:00
Prabir Pradhan
8605f83e28 Add AIDL definiton for IInputDeviceBatteryState
Create an AIDL parcelable class to represent the battery state of an
input device.

Instead of separately querying the battery status and capacity from an
app-local implmentation of "InputDeviceBatteryState" that acts as a
"manager", we combine them into one method that queries the battery
state from BatteryController.

Bug: 243005009
Test: atest BatteryControllerTests
Test: atest InputDeviceBatteryListenerTests
Change-Id: I2b77aeca6a2d062c8b04a16e38d3acf6c996c134
2022-09-28 20:32:05 +00:00
TreeHugger Robot
004ba6f57d Merge "Camera: Update API doc for DISPLAY_SYNC timestamp base" into tm-qpr-dev am: 87dd924237 am: e9b1b7819f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20056360

Change-Id: Icb669642935f2cb21e4e93a4ca0978dd4161c90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 20:17:36 +00:00
TreeHugger Robot
e9b1b7819f Merge "Camera: Update API doc for DISPLAY_SYNC timestamp base" into tm-qpr-dev am: 87dd924237
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20056360

Change-Id: I43ec666132de7300943c7fd11a97b27de764ae49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 19:43:57 +00:00
TreeHugger Robot
87dd924237 Merge "Camera: Update API doc for DISPLAY_SYNC timestamp base" into tm-qpr-dev 2022-09-28 19:03:21 +00:00
Sandro Meier
9891ad2db4 Merge "Move InputManagerInternal to com.android.server.input" 2022-09-28 11:29:31 +00:00
Nathalie Le Clair
913a71d636 Revert "CEC: Remove HdmiControlManager#mLocalPhysicalAddress variable"
This reverts commit 9f5ec0c7d0.

Reason for revert: this CL removed getPhysicalAddress from the main service thread, which caused errors.

Change-Id: I42c478831c4daa5d17e55f7f8edd253449b863b8
2022-09-28 09:41:43 +00:00
Vaibhav Devmurari
5c2bccc935 Merge "Add support for KEYBOARD_BACKLIGHT to LightsManager API" 2022-09-28 09:39:41 +00:00
Sally Qi
6a7f4a50eb Merge "Add annotation for all dataspace enums." 2022-09-27 19:34:15 +00:00
Sandro Meier
ae89692d0a Move InputManagerInternal to com.android.server.input
InputManagerInternal is a left over in android.hardware.input that is
only used fromt the system_server process. This is from a change in
Honeycomb that partially got reverted. Moving this back to be able to
use com.android.server classes in InputManagerInternal for an upcoming
change.

Test: atest InputManagerServiceTests
Bug: 244516415
Change-Id: I8640f806800ef3b1ac06766b5c49b12cbb30d647
2022-09-27 14:07:26 +00:00
Shuzhen Wang
42efa76749 Camera: Update API doc for DISPLAY_SYNC timestamp base
Now the SurfaceView timestamp override only happens in fixed frame rate
case.

Test: Build
Bug: 239775097
Change-Id: I02cf36ed664a446ba3e8f6f04ce42caafaa5ae90
2022-09-26 13:49:45 -07:00
Sally Qi
8b6a6fa889 Add annotation for all dataspace enums.
Bug: 246347925
Test: builds
Change-Id: I7661121578a3a6db1840b5c5613a4b6750f9860a
2022-09-26 07:50:07 -07:00
Chavi Weingarten
c6f10b42d9 Move MediaProjectionGlobal API to DisplayManager
Add a static method in DisplayManager that allows the caller to create a
VirtualDisplay without having an instance of DisplayManager (which
requires a context). This can only be used from a process that has the
CAPTURE_VIDEO_OUTPUT permission.

Also added RequiresPermission(CAPTURE_VIDEO_OUTPUT)
annotation for the new API.

Test: DisplayManagerTest
Bug: 247776252
Change-Id: I1eb94ab1063d89860cdfb2a58d4653d9a77eec98
2022-09-23 21:50:49 +00:00
Vaibhav Devmurari
e11ba33b51 Add support for KEYBOARD_BACKLIGHT to LightsManager API
Add new light type for KEYBOARD_BACKLIGHT to be used to
find if the Light is of type keyboard backlight
We will add code to modify Keyboard backlight based on key
events in future CLs

Test: None
Bug: 245506418
Change-Id: I0c7efb687c74c029e61c878c55f3af40710ec86d
2022-09-22 21:57:25 +00:00
Weilin Xu
5dcb70d88c Merge "Refactor locks in TunerAdapter" 2022-09-22 21:48:19 +00:00
Weilin Xu
f2a1d2c5c8 Refactor locks in TunerAdapter
Non-final member variables in TunerAdapter and
TunerCallbackAdapter are guarded by locks now. Final member
variables are moved outside the lock since they are already
thread-safe.

Bug: 247856985
Test: atest android.hardware.radio.tests.functional
Change-Id: I39204a4d5036aa66c72e54a673814a7cbbcb18b3
2022-09-22 21:47:40 +00:00
Chavi Weingarten
85a1ebf628 Make overrideHdrTypes per display
The API overrideHdrTypes should be per display. Add an API into DMS so
DMS can set the override with the correct displayToken. Remove usage of
getInternalDisplayToken in DisplayTests

Test: DisplayTest
Bug: 242714168
Change-Id: Ib338624a71a897d8d718080850f672a219f9627e
2022-09-22 14:44:46 +00:00
Kenneth Ford
614e75b360 Merge changes from topic "base-state-api" into tm-qpr-dev am: d3955eaa8a am: a1fe0c4b15
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19798787

Change-Id: I1ffab9c02a210bf27c097c3d3776e64fea992aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 03:52:55 +00:00
Kenneth Ford
a1fe0c4b15 Merge changes from topic "base-state-api" into tm-qpr-dev am: d3955eaa8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19798787

Change-Id: I61160121c056fd49c947789be396e2b31537ea0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 03:15:47 +00:00
Kenneth Ford
7f8d5fd451 Introduces requestBaseStateOverride test API
Adds new requestBaseStateOverride on DeviceStateManager
to be used for testing, to provide a similar behavior
to changing the physical configuration of the device.

This is necessary now that the requestState API is being
used for features now, we need a test API that will
be a closer simulation to physical device changes.

Bug: 234336979
Test: DeviceStateManagerGlobalTest
Change-Id: I6ad9e799329f16521aa3c13b248eed762fe0b121
2022-09-21 23:47:04 +00:00
Chavi Weingarten
fd5609c856 Remove usage of getInternalDisplayToken for DisplayPrimaries
Instead calling to DisplayManagerInternal to get the DisplayPrimaries
for a particular displayId.

Test: DisplayWhiteBalanceTintControllerTest
Bug: 242714168
Change-Id: Ifc5ecc60937d186c0c94858ffc543d36df8f2d07
2022-09-20 20:49:24 +00:00
Kenneth Ford
d5fe5cc1ca Adds requestBaseStateOverride method on DeviceStateManagerService
Server side changes to accompany the addition of the
DeviceStateManager#requestBaseStateOverride test API

Bug: 234336979
Test: OverrideRequestControllerTest
 && DeviceStateManagerServiceTest
Change-Id: Ib915b245acd260be1e0d5016d765af5598ea390c
2022-09-20 18:11:27 +00:00
Phill Hayers
6120c41edf Merge "Add a virtual Dpad." 2022-09-20 12:17:08 +00:00
Phill Hayers
060ded7841 Add a virtual Dpad.
Bug: 244519097
Test: atest VirtualDpadTest and atest VirtualDeviceManagerServiceTest

Change-Id: Iafce6fccee9f761e79e8fd845bb6e9b1e1490b26
2022-09-20 08:44:40 +00:00
Ilya Matyukhin
b5ce442cd4 Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev am: 1ecaa4d68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949884

Change-Id: Ib162b02b868f3befdf8336295c2535ecfeec0ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 00:22:06 +00:00
Ilya Matyukhin
6eda3a1d1a Refactor UDFPS display logic and remove illumination
Bug: 243818429
Test: atest SystemUITests
Change-Id: I285f136a75bbd26226a39c544f3c07101ff8eb80
Merged-In: I285f136a75bbd26226a39c544f3c07101ff8eb80
2022-09-19 06:13:06 +00:00
Ilya Matyukhin
e4f579d6cd Refactor UDFPS display logic and remove illumination
Bug: 243818429
Test: atest SystemUITests
Change-Id: I285f136a75bbd26226a39c544f3c07101ff8eb80
2022-09-19 06:02:40 +00:00
Chavi Weingarten
1e8b7d543a Create DMS wrapper around hidden SC APIs
There are several places that are calling the SC display APIs that were
hidden. They are already protected in SF so all the processes using the
hidden APIs were running as shell. However, we want to remove the APIs
into SF since they create confusion and instead replace with calls to
system server. For now, route the SurfaceControl hidden API calls that
are not used by system server to call through to DMS via the new
MediaProjectionGlobal API.

This will ensure the callers have a release to migrate before we remove
the APIs.

This also partially reverts commit c4bf46c247.

Test: Apps using SurfaceControl hidden display APIs
Bug: 237664947
Change-Id: I859743cb8b10c0352a30280a610b13a4f44f34dc
2022-09-16 17:25:36 +00:00
Chavi Weingarten
4960560d62 Merge "Migrate screen capture code to ScreenCapture file" 2022-09-15 17:35:56 +00:00
Joshua Mccloskey
8de51e687f Merge "Updated power press strings in enrollment." into tm-qpr-dev am: ce1e8cee95 am: 452cd82036
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19889941

Change-Id: I3552b658ee69175b41bbaff6585380cc4e50b9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:50:02 +00:00
Chavi Weingarten
2b7f2aee30 Migrate screen capture code to ScreenCapture file
Test: ScreenshotTests
Bug: 242714168
Change-Id: I8061f1717cc4e293ee07672d6d415c2c36010ccd
2022-09-14 15:35:46 +00:00
Joshua Mccloskey
452cd82036 Merge "Updated power press strings in enrollment." into tm-qpr-dev am: ce1e8cee95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19889941

Change-Id: I72eb5f366a5277378eb7f5790a109cc4f02696e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 23:35:23 +00:00
Joshua Mccloskey
ce1e8cee95 Merge "Updated power press strings in enrollment." into tm-qpr-dev 2022-09-13 23:12:40 +00:00
Prabir Pradhan
0c89829720 Clean up some input interfaces
Make NativeInputManagerService package-private and remove the
@VisibleForTesting annotation, and update the annotation ordering in the
methods of BatteryState and InputDevice.

Bug: 245989146
Test: Build
Change-Id: I6ea839fac8037c2dd77037aed0d05b0f92ea43e3
2022-09-13 21:54:55 +00:00
Sally Qi
bfdba14a78 Merge "Fix throw exception when using HardwareBuffer.BLOB format to create ImageReader/ImageWriter object." 2022-09-13 15:11:20 +00:00
Sally Qi
49afba7d80 Fix throw exception when using HardwareBuffer.BLOB format to create
ImageReader/ImageWriter object.

- Internally, we should deal with HardwareBuffer.BLOB format according
  to surface's dataSpace. Directly passing BLOB format to
  getEstimatedNativeAllocBytes function will throw exception because
  BLOB format is not handled inside. Instead, use their corresponding
  imageFormat to avoid such failure in this case.

Bug: 244268240
Test: atest android.hardware.camera2.cts.ImageReaderTest, atest
android.hardware.camera2.cts.ImageWriterTest, atest
android.hardware.cts.DataSpaceTest

Change-Id: I3f18b9d3550f88be82cde75372637a3ae528b5ec
2022-09-12 12:14:12 -07:00
Treehugger Robot
fd56fe87c7 Merge "Fix sticky firstEventAfterDiscontinuity setting" am: f63f20af72 am: 3906d1422e am: d9bbd3cc42 am: 8dd8b6e9b3 am: b0b9c8e690
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2213744

Change-Id: I26b3b8b98a3a256401e5244f76fec04717215884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-10 02:59:06 +00:00
Treehugger Robot
b0b9c8e690 Merge "Fix sticky firstEventAfterDiscontinuity setting" am: f63f20af72 am: 3906d1422e am: d9bbd3cc42 am: 8dd8b6e9b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2213744

Change-Id: Ic9c3c80c453bef5b018b1c805fa58b417184ea79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-10 02:29:25 +00:00
Treehugger Robot
8dd8b6e9b3 Merge "Fix sticky firstEventAfterDiscontinuity setting" am: f63f20af72 am: 3906d1422e am: d9bbd3cc42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2213744

Change-Id: Ieb66e41ce87b411d41b9b6b1cb0266c4cb72c212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-10 01:47:08 +00:00
Brian Duddie
9c7e48eb1e Fix sticky firstEventAfterDiscontinuity setting
This value needs to be explicitly set to false to prevent re-using a
stale "true" value.

Fixes: 245965753
Test: CTS SensorHeadTrackerTest#testDiscontinuity (pending upload)
Change-Id: Icd018e0cab9e30b0677970760a38a390d9dd2a3c
2022-09-09 22:51:38 +00:00