Commit Graph

5806 Commits

Author SHA1 Message Date
Joshua Mccloskey
8a3582ea3c Merge "Integrate Session Coordinator" 2022-10-18 14:13:00 +00:00
Joshua McCloskey
5945a4b818 Integrate Session Coordinator
Test: atest AuthResultCoordinatorTest AuthSessionCoordinatorTest MultiBiometricLockoutStateTest
Test: Verified auth with strong & convenient biometric.
Test: Verified auth with strong & weak biometric.
Bug: 244355277
Change-Id: I38ea11852fa3052a13d955f1de597d8428878821
2022-10-17 21:38:00 +00:00
TreeHugger Robot
70c78e08a6 Merge "Fix possible ArrayIndexOutOfBoundsException" 2022-10-17 21:02:58 +00:00
Scott Wiest
8ba178911a Merge "Checking for null proxy object before operating on a method of the proxy object" into tm-qpr-dev am: 5a29df1b74 am: 271121fdd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103048

Change-Id: I52b6e4edfc1be93cda1d8631edd7362e9a69b4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 18:46:26 +00:00
Scott Wiest
271121fdd9 Merge "Checking for null proxy object before operating on a method of the proxy object" into tm-qpr-dev am: 5a29df1b74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103048

Change-Id: Ibd1c9cede40e11042f6880bae05270597060f1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 18:38:28 +00:00
Scott Wiest
5a29df1b74 Merge "Checking for null proxy object before operating on a method of the proxy object" into tm-qpr-dev 2022-10-17 18:23:25 +00:00
TreeHugger Robot
4f462773e2 Merge "Camera: re-run metadata-generate for camera API docs" 2022-10-14 19:22:58 +00:00
Shuzhen Wang
964934992a Camera: re-run metadata-generate for camera API docs
This makes sure API docs are up-to-date with latest toolchain

Test: Build
Change-Id: I8a8c9304e00d16f0807ce81c02eb603b781664e6
2022-10-14 00:35:04 +00:00
Sally Qi
d5d106aea9 Merge "Plumb getOverlaySupport() into Display Manager for HWUI." 2022-10-13 21:29:47 +00:00
HQ Liu
1bfae246fb Fix possible ArrayIndexOutOfBoundsException
Seeing ArrayIndexOutOfBoundsException while adding an input device with
vibrator. The index used to iterate vibrator ids increased before being
used to get the id from an sparsed array, so it is causing out of bounds
exception.

Bug: 253079798
Test: m; InputDeviceVibratorManagerTest
Change-Id: I019790f74184058020194ae42a35d8ed972ceaa7
2022-10-13 21:02:19 +00:00
Guillaume Bailey
b749a04f7e Merge "Fix typo" 2022-10-13 09:10:50 +00:00
Guillaume Bailey
28bccf2540 Fix typo
Test: comment change only
Change-Id: Icd774e9f84dbc3939ca2088023d31ca49ad747cc
2022-10-12 16:19:33 +02:00
Sally Qi
02068d5aaa Plumb getOverlaySupport() into Display Manager for HWUI.
- HWUI can understand if Fp16 for HDR can be supported.

Bug: 242588489
Test: builds
Change-Id: I603ded84a5fbe6142afd167224903cf4010a309f
2022-10-10 17:46:42 -07:00
Weilin Xu
d2926a1ee0 Merge "Fix secondary ids comparison in strictEquals" 2022-10-06 00:31:11 +00:00
TreeHugger Robot
2b2b0da539 Merge "Add InputDeviceBatteryListener to InputManager" into tm-qpr-dev am: 666111dfa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19866529

Change-Id: Ice37f87eb776888b3cd9109d127976929ca6e45d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 21:14:19 +00:00
TreeHugger Robot
666111dfa7 Merge "Add InputDeviceBatteryListener to InputManager" into tm-qpr-dev 2022-10-05 20:52:59 +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
Scott Wiest
9deb753f2e Checking for null proxy object before operating on a method of the proxy
object

Test: Compiled code

Bug: 242767826

Change-Id: I47e705902220e690ea8b560b051fc446a6ec2955
2022-10-03 19:08:21 +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
Prabir Pradhan
b6f775cea2 Add InputDeviceBatteryListener to InputManager
System apps can now register an InputDeviceBatteryListener on a
per-device basis to be notified of battery changes.

- InputManager manages registration of the binder callback with
  InputManagerService to ensure that there is only one battery
  listener per process.
- The battery listener is invoked immediately upon registration
  to provide the initial battery state for the device.
- The callbacks are removed automatically when the process dies.
- This CL does not yet identify changes in battery state for monitored
  devices.

DD: go/inputdevice-battery-notifications

Bug: 243005009
Test: atest FrameworkServicesTests
Test: atest FrameworkCoreTests
Change-Id: Idf2b06a099155a6f5cc13b55dcd40852f54aa56c
Merged-In: Idf2b06a099155a6f5cc13b55dcd40852f54aa56c
(cherry picked from commit e86f73ac50)
2022-09-22 16:59:53 +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