Commit Graph

4542 Commits

Author SHA1 Message Date
Joshua Mccloskey
3fcc226026 Merge "Added additional strings for fpm" into sc-dev am: 1ce11286e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14107199

Change-Id: Ib52dff8e33b944ca5b5333195a86be3d53a905d3
2021-04-13 18:45:36 +00:00
Joshua Mccloskey
1ce11286e0 Merge "Added additional strings for fpm" into sc-dev 2021-04-13 18:21:01 +00:00
Lais Andrade
a7a7063551 Merge "Expose vibrator frequency bandwith to the service" into sc-dev am: f6febe9b65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054486

Change-Id: Icd97497edce6ef4c99fda29fa21e31887674c406
2021-04-13 17:42:50 +00:00
Lais Andrade
ca2654289a Merge "Add Vibrator.cancel method with usage filters" into sc-dev am: b4477092c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033675

Change-Id: I450a2b6bcbe904ef0036c9aea192dd5c1369051f
2021-04-13 17:42:26 +00:00
Lais Andrade
f6febe9b65 Merge "Expose vibrator frequency bandwith to the service" into sc-dev 2021-04-13 17:31:18 +00:00
Lais Andrade
b4477092c4 Merge "Add Vibrator.cancel method with usage filters" into sc-dev 2021-04-13 17:30:51 +00:00
Michael Wright
a560fcc6f0 Merge "Add DisplayModeDirector support for UDFPS" into sc-dev am: 22f7cd1311
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140115

Change-Id: I1dff70b3e8406706cf19404875400d93a3081347
2021-04-13 16:52:22 +00:00
Michael Wright
22f7cd1311 Merge "Add DisplayModeDirector support for UDFPS" into sc-dev 2021-04-13 16:43:38 +00:00
Lais Andrade
853dcb5a41 Expose vibrator frequency bandwith to the service
Add hidden APIs to expose the supported frequency range and maximum
amplitudes at each frequency for the device in Vibrator.java.

Also add a hidden method hasFrequencyControl().

Bug: 167947076
Test: VibratorTest
Change-Id: If2d5f8f0aa92223b4a342893f5fd3a1668dfcff1
2021-04-13 14:03:08 +00:00
Lais Andrade
6e075783ee Add Vibrator.cancel method with usage filters
Add a new hidden API to Vibrator and VibratorManager that allows
vibrations to be cancelled based on their usage attribute.

The new API is used by the NotificationManagerService on volume button
press to only cancel ongoing attentional haptics, triggered for alarm,
notification or ringtone.

Fix: 182440404
Test: VibratorManagerTest & BuzzBeepBlinkTest
Change-Id: I4bf55928cf3b7dd79f66d53d570001a5205ce2d0
2021-04-13 13:04:05 +00:00
Kevin Chyn
84face646c Merge "Revert "Revert "Update face detectInteraction""" into sc-dev am: d01ed12c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14147116

Change-Id: Iaa5a9d1abddfe1e1c94f8e87b6094704bd0a2bde
2021-04-13 01:54:33 +00:00
Kevin Chyn
d01ed12c5d Merge "Revert "Revert "Update face detectInteraction""" into sc-dev 2021-04-13 01:50:59 +00:00
Kevin Chyn
fdcd1a4bc6 Revert "Revert "Update face detectInteraction""
This reverts commit 2a4f86bea0.

Reason for revert: Re-merge with NPE fixed
Fixes: 184672091

Change-Id: I68315310d9c7226584564b3b1eb3861189c7d080
2021-04-12 14:42:55 -07:00
Lais Andrade
ef40d628b5 Merge "Rename CombinedVibrationEffect to CombinedVibration" into sc-dev am: 8b2586c6ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104345

Change-Id: I5b4d66ee7d5f284dcd55f0044bc249d3c6d46b9a
2021-04-12 20:09:30 +00:00
Lais Andrade
d8dc940fc0 Rename CombinedVibrationEffect to CombinedVibration
The change makes the distinction between VibrationEffect and
CombinedVibratio clearer. The later is a combination of the former with
the extra information about the vibrator ids, allowing effects to be
played in one or more vibrators in parallel or in sequence.

The methods create/start synced where also renamed to parallel (together
with respective builder classes), to indicate they perform one or more
effects in parallel on multiple vibrators. This is also a better match
to the sequential combinations.

This change also deprecates the Context.VIBRATOR_SERVICE in favour of
the new VIBRATOR_MANAGER_SERVICE. The default vibrator can be retrieved
from the manager system service.

Same deprecation applied to InputDevice.getVibrator method.

Fix: 184123900
Test: CombinedVibrationTest
Change-Id: I44d8b225098d35fbf7783254acaf6a78f9fb4505
2021-04-12 16:34:54 +00:00
Wei Wang
567d223388 Merge "Revert "Update face detectInteraction"" into sc-dev am: cc2602452b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14141083

Change-Id: Ide3e8546dc32d641d0f643fa86e525aa0fd7d189
2021-04-10 02:00:43 +00:00
Michael Wright
e651abc295 Add DisplayModeDirector support for UDFPS
UDFPS needs to lock to a given refresh rate in order to function
properly, so we register a listener for when it's enabled in order to
make sure it gets the right refresh rates.

Bug: 181682258
Test: atest DisplayModeDirectorTest
Change-Id: I54afb12f8e4f03a3b0c384112fc2d9b1806de719
2021-04-10 02:45:38 +01:00
Wei Wang
cc2602452b Merge "Revert "Update face detectInteraction"" into sc-dev 2021-04-10 01:45:35 +00:00
Kevin Chyn
2a4f86bea0 Revert "Update face detectInteraction"
This reverts commit 5b0dd45ad8.

Reason for revert: b/184978217?

Change-Id: Ie92632f0373376f238eac5638aba71a1a31abdcf
2021-04-10 00:21:54 +00:00
Kevin Chyn
ea0c0a3d35 Merge "Update face detectInteraction" into sc-dev am: a817527343
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14120411

Change-Id: Icad53748d60e0443a0f4b89e800e78f1a4fcaccd
2021-04-09 19:35:15 +00:00
Kevin Chyn
a817527343 Merge "Update face detectInteraction" into sc-dev 2021-04-09 19:20:41 +00:00
Beverly Tai
b66e1fba64 Merge "Enable quick pickup gesture by default" into sc-dev am: 565c79c395
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14066639

Change-Id: I7b05120ff8873ff808e7888d0b65e751cd08c7b7
2021-04-09 18:54:26 +00:00
Beverly Tai
565c79c395 Merge "Enable quick pickup gesture by default" into sc-dev 2021-04-09 18:22:46 +00:00
TreeHugger Robot
826fe598b7 Merge "usb: Address some API review comments" into sc-dev am: 0a0ddadab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921669

Change-Id: I06e3e7be6dad6dfa84d5b756ce33e35af8316adf
2021-04-09 05:35:35 +00:00
TreeHugger Robot
0a0ddadab5 Merge "usb: Address some API review comments" into sc-dev 2021-04-09 05:14:47 +00:00
Evan Severson
d6cc9b5a70 Merge "Update mic/cam toggles to the latest UI mocks" into sc-dev am: 81a64e22f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14024566

Change-Id: I16e67e270dca33f9e332c8e24b5e3b6d0318042f
2021-04-09 03:26:56 +00:00
Evan Severson
81a64e22f9 Merge "Update mic/cam toggles to the latest UI mocks" into sc-dev 2021-04-09 03:09:07 +00:00
Kevin Chyn
5b0dd45ad8 Update face detectInteraction
1) Sets the sensor property based on the HAL, instead of hard coding
   false
2) Schedules/cancels detection when requested
3) Updates biometric dumpsys to include internal properties

Test: atest com.android.server.biometrics
Test: adb shell dumpsys biometric
Test: manual
Bug: 184672091

Change-Id: I2fb1db0994f6d2ed235420967d78e70f1b13cdd0
2021-04-07 17:58:52 -07:00
Ady Abraham
a74b974fb6 Merge "DisplayManagerGlobal: suppress redundant onDisplayChanged events" into sc-dev am: db96662e30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14097994

Change-Id: Ie720b95eb28e853641ede05e488f4136bd360ed7
2021-04-07 16:57:41 +00:00
Ady Abraham
db96662e30 Merge "DisplayManagerGlobal: suppress redundant onDisplayChanged events" into sc-dev 2021-04-07 16:45:53 +00:00
Treehugger Robot
5b43f05ba1 Merge "CEC: Remove the TODO in HdmiPlaybackClient class" am: cc62385767 am: f4e1962df0 am: 7c740535b1 am: 1350355d27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666843

Change-Id: If91d07dfc69027927c9790d18f03e9c27fd07716
2021-04-07 16:35:27 +00:00
Treehugger Robot
1350355d27 Merge "CEC: Remove the TODO in HdmiPlaybackClient class" am: cc62385767 am: f4e1962df0 am: 7c740535b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666843

Change-Id: I2d7066701c2eb180f838649eee32df84a3d60871
2021-04-07 15:59:07 +00:00
Treehugger Robot
7c740535b1 Merge "CEC: Remove the TODO in HdmiPlaybackClient class" am: cc62385767 am: f4e1962df0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666843

Change-Id: I31b84ab1a150b53bcf4ca0f97f4a1bd3d7d5c4ad
2021-04-07 15:31:13 +00:00
Mathew Inwood
7379cfeee3 Merge "Remove duplicate compat logging." into sc-dev am: 4058f5913a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102914

Change-Id: I405708d2e76f88af5e5a5ebcd2789162d6ad01bc
2021-04-07 14:25:27 +00:00
Mathew Inwood
4058f5913a Merge "Remove duplicate compat logging." into sc-dev 2021-04-07 14:15:39 +00:00
Kriti Dang
90b494a121 Merge "add int range on #getManufactureYear and #getManufactureWeek in DeviceProductInfo" into sc-dev am: 0d4e510467
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14052185

Change-Id: Icf4ae487e58ae1ae5302ca568472b9669894af5d
2021-04-07 14:08:09 +00:00
Kriti Dang
0d4e510467 Merge "add int range on #getManufactureYear and #getManufactureWeek in DeviceProductInfo" into sc-dev 2021-04-07 13:49:36 +00:00
Aravind Angadi
4e891c6e62 CEC: Remove the TODO in HdmiPlaybackClient class
HdmiControlService.oneTouchPlay method is already switching the
long running one touch play process to the service thread from
the UI thread and is also able to handle multiple OTP requests
in parallel. Remove TODO to use PendingResult.

Bug: 159901363
Test: None
Change-Id: Ife8c8268edb8a40255a52dd1eda2ab60020803c8
2021-04-07 12:30:06 +00:00
Kriti Dang
7efe08a2fa add int range on #getManufactureYear and #getManufactureWeek in
DeviceProductInfo

Bug: 182914930
Test: N/A
Change-Id: I1988690c135d8357f6ed55958d2977836006d12f
2021-04-07 11:46:32 +02:00
Joshua Mccloskey
952a19ab93 Added additional strings for fpm
Test: Verified that strings are available
Bug: 184591799
Change-Id: I3961271a94b8ee9b4ded4672b0d2874c54f48e29
2021-04-06 17:32:34 -07:00
Ady Abraham
6f1cac9912 DisplayManagerGlobal: suppress redundant onDisplayChanged events
With Frame Rate Override enabled, an app could get an onDisplayChanged
events which seems redundant. An example would be:
1. Display changed refresh rate to 60Hz - onDisplayChanged was called
2. App's frame rate override changed to 60Hz - onDisplayChanged was called

To avoid sending these redundant events, DisplayManagerGlobal caches
the last DisplayInfo that was reported to the app and based on it it
decides whether to send the event or not.

Bug: 184588343
Test: atest SetFrameRateTest
Test: atest FrameRateOverrideHostTest
Change-Id: I97c7b2b9a799424998b1b717a4311d3d08b3178f
2021-04-06 15:33:19 -07:00
Jayant Chowdhary
b2f70b04d4 Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." 2021-04-06 21:24:12 +00:00
Jayant Chowdhary
db762c7e13 getCameraIdListNoLazy : remove system cameras from mTorchStatus as well.
Bug: 182530469

Test: Make Emulator back camera system camera; atest FlashlightTest.java

Merged-In: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Change-Id: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit bedb9950c8)
2021-04-06 20:13:25 +00:00
Mathew Inwood
87a7934e7c Remove duplicate compat logging.
The call to Compatibility.isChangeEnabled also logs so no need to
make an explicit call to Compatibility.reportChange().

Bug: 183512729
Test: TH
Change-Id: I062a9cfa364c36868180cce3be49da020dd91341
2021-04-06 10:53:02 +00:00
Jayant Chowdhary
e0cb7ab0f1 Merge "camera2: reduce logspam from cameraIdHasConcurrentStreams." into sc-dev am: 9d350e3a06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14094712

Change-Id: I8f8095c4a8bc7ae5f2cd33d8658c7dfd86d9777c
2021-04-05 22:58:55 +00:00
Jayant Chowdhary
9d350e3a06 Merge "camera2: reduce logspam from cameraIdHasConcurrentStreams." into sc-dev 2021-04-05 22:35:44 +00:00
TreeHugger Robot
250d9dc4a0 Merge "Camera: Avoid possible NPE when forwarding images" into sc-dev am: 44b4d77808
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14095285

Change-Id: I6e83919cd0c1b4b7b93bb204b873284583cc0480
2021-04-05 21:56:48 +00:00
TreeHugger Robot
44b4d77808 Merge "Camera: Avoid possible NPE when forwarding images" into sc-dev 2021-04-05 21:55:01 +00:00
Jayant Chowdhary
952d8b0a38 camera2: reduce logspam from cameraIdHasConcurrentStreams.
Physical camera ids aren't included in concurrent camera combinations.
The logs aren't real errors. Make them debug logs.

Bug: 184194887

Test: atest LogicalCameraTest#testBasicPhysicalStreaming doesn't show
      unecessary logs while calling getCameraCharacteristics for
      physical camera ids.

Change-Id: I4f6e9030f23c31e0dc796882e6e82964d5a80668
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2021-04-05 13:39:41 -07:00
Emilian Peev
707d5e5a4b Camera: Avoid possible NPE when forwarding images
Use the local reader argument instead of the member
variable which can get reset.
Additionally, make sure to execute the extension forward
processor 'ImageReader' callback using the extension session
handler.

Bug: 184447319
Test: atest -c
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java#testCloseCaptureSession
--iterations=10
atest -c
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: Id8f8818ad478b70438cbd18d46ef79263bc4de9d
2021-04-05 13:15:47 -07:00