Commit Graph

4487 Commits

Author SHA1 Message Date
Treehugger Robot
24f475b502 Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 6e7f16ac1e am: 59cb50e06a am: 8380a16e8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676434

Change-Id: I8cfd3fc1e3287ec2cef799d008dc5bcbcc1881a9
2021-04-19 10:55:33 +00:00
Treehugger Robot
8380a16e8e Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 6e7f16ac1e am: 59cb50e06a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676434

Change-Id: I88c22d703fdf77f59a480017060c50f7ed19e50b
2021-04-19 10:31:33 +00:00
Treehugger Robot
6e7f16ac1e Merge "CEC: Drop TODOs marked as fixed/obsolete" 2021-04-19 09:46:37 +00:00
Janis Danisevskis
e5ae08e49d Merge "Fix operation auth bound keys." am: b3671c4ab5 am: f941d3fb5b am: 0992040e48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677200

Change-Id: Ie4972c2b9da95515b3e98f66af716e7d1fcf156c
2021-04-17 07:09:40 +00:00
Janis Danisevskis
0992040e48 Merge "Fix operation auth bound keys." am: b3671c4ab5 am: f941d3fb5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677200

Change-Id: Ia2c52ec3e34b067d61b605fd4bb0bcbc3b420e55
2021-04-17 06:44:19 +00:00
Janis Danisevskis
8c97d4fe79 Fix operation auth bound keys.
CryptoObject still called the legacy AndroidKeystoreProvider which did
not return the correct operation handle for per operation auth bound
keys.

Bug: 184804041
Bug: 185181377
Test: CtsVerifier->Security->Biometric Tests->2a Strong Biometrics +
      Crypto
Merged-In: I0bceff0425e7ef32c394f33deda3c78f729c0c6c
Change-Id: I0bceff0425e7ef32c394f33deda3c78f729c0c6c
2021-04-16 12:55:33 -07:00
Kriti Dang
49fed7b66a Merge "adding a public constructor for DeviceProductInfo. Improving javadoc for #getManufacturePnpId" into sc-dev 2021-04-15 11:11:11 +00:00
Anh Pham
74515037ae Merge "Move isChangeEnabled() to end of the if statement." into sc-dev 2021-04-15 08:08:37 +00:00
Aravind Angadi
9eee708a97 CEC: Drop TODOs marked as fixed/obsolete
Bug: 159901363
Test: None
Change-Id: Ied8bf487857c3fb3f27d92d7dbdd8beeb981442c
2021-04-15 12:52:53 +05:30
Kevin Chyn
875b80655c Move from face-specific settings to generic biometric settings
Fixes: 184965821
Test: On various devices:
      adb shell settings put secure biometric_app_enabled 0/1
      adb shell settings put secure biometric_keyguard_enabled 0/1

Test: On face-only devices that shipped before S:
      Existing settings (settings > security > face unlock) are not
      affected and still work.

      Newly added secure settings do not take effect (as expected)

Test: atest com.android.server.biometrics
Test: atest KeyguardUpdateMonitorTest

Change-Id: Ie0fda46facefd3ecfbbce6ef769d6d8e9fdfb09b
2021-04-14 16:31:28 -07:00
Kriti Dang
c8fe1ddd6c adding a public constructor for DeviceProductInfo.
Improving javadoc for #getManufacturePnpId

Bug: 182424090
Test: atest DisplayTest
Change-Id: I99ce9dae6ace765462efa8d495fb845a6d70aa5e
2021-04-14 12:45:10 +02:00
Anh Pham
4fb8a97b21 Move isChangeEnabled() to end of the if statement.
Bug: 185207500
Test: Build, locally tested a simple app that calls
SensorManager.registerListener() and observed that the log
CompatibilityChangeReporter: Compat change id reported: 136069189
is no longer printed out in logcat.

Change-Id: I8ef197b650bb07638300045d42de96ba3bcd20e2
2021-04-14 11:27:35 +02:00
Joshua Mccloskey
1ce11286e0 Merge "Added additional strings for fpm" into sc-dev 2021-04-13 18:21:01 +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
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
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
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
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
a817527343 Merge "Update face detectInteraction" into sc-dev 2021-04-09 19:20:41 +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
0a0ddadab5 Merge "usb: Address some API review comments" into sc-dev 2021-04-09 05:14:47 +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
db96662e30 Merge "DisplayManagerGlobal: suppress redundant onDisplayChanged events" into sc-dev 2021-04-07 16:45:53 +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
4058f5913a Merge "Remove duplicate compat logging." into sc-dev 2021-04-07 14:15:39 +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
9d350e3a06 Merge "camera2: reduce logspam from cameraIdHasConcurrentStreams." into sc-dev 2021-04-05 22:35:44 +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
Jayant Chowdhary
719a693721 Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." into rvc-qpr-dev am: 3a6b247ec0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14071306

Change-Id: Ie89d317127ad31866256a290899e91acc730cfc6
2021-04-03 06:30:22 +00:00
Kevin Chyn
ea0ed42e8f Merge "Schedule cleanup with the callback that was passed in" into sc-dev 2021-04-03 01:25:29 +00:00
TreeHugger Robot
dd6adbf3f8 Merge "Camera: Add a maximum size flag to MandatoryStreamInformation" into sc-dev 2021-04-02 21:40:22 +00:00
Kevin Chyn
6a0b25111a Schedule cleanup with the callback that was passed in
For the AIDL providers, send the scheduler the callback that
was passed in. Otherwise, the test infrastructure wouldn't know
when cleanup completes. This saves ~20s from each test session
close time.

The added logs do not affect/spam production code.

Bug: 152240892
Test: atest CtsBiometricsTestCases
Change-Id: I047ec8da01b3237e738e4567eb6ef3554f6b868d
2021-04-02 12:19:40 -07:00
Jayant Chowdhary
02622abbe2 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-02 18:55:48 +00:00